|
|
@@ -163,7 +163,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
if (Func.isEmpty(nodes)) {
|
|
|
this.tec.getLog().append("【WBS信息缺失】");
|
|
|
}
|
|
|
- tec.constantMap.put(CHAIN,nodes.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
|
|
|
+ tec.constantMap.put(CHAIN,nodes.stream().map(e->StringUtils.isNotEmpty(e.getFullName())?e.getFullName():e.getNodeName()).collect(Collectors.toList()));
|
|
|
/*节点参数*/
|
|
|
tec.constantMap.put(WP,getWpMap(one));
|
|
|
/*表格名称*/
|
|
|
@@ -1219,7 +1219,7 @@ public List<ElementData> setScale(Integer scale,List<ElementData> data){
|
|
|
private List<KeyMapper> listForContract(List<Long> ids,String projectId,String nodeId){
|
|
|
String pkIds=ids.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
List<Map<String,Object>> listMap = listMap(ids,ExecuteType.INSPECTION);
|
|
|
- Map<String,Object> wtpMap= this.jdbcTemplate.queryForMap("select b.parent_id parentId,b.wbs_id wbsId from m_wbs_tree_contract a join m_wbs_tree_private b on a.is_type_private_pid=b.p_key_id where a.p_key_id ="+ids.get(0)+" limit 1");
|
|
|
+ Map<String,Object> wtpMap= this.jdbcTemplate.queryForMap("select b.parent_id parentId,b.wbs_id wbsId from m_wbs_tree_contract a join m_wbs_tree_private b on (a.id=b.id or a.old_id=b.id ) where a.p_key_id ="+ids.get(0)+" and b.project_id="+projectId+" limit 1");
|
|
|
if(Func.isNotEmpty(listMap)){
|
|
|
/*当前节点的某个元素存在多种作用域的公式，作用域范围越小优先级越高*/
|
|
|
List<KeyMapper> list= listMap.stream().map(m->BeanUtil.toBean(m,KeyMapper.class)).collect(Collectors.toList());
|
yangyj