|
@@ -704,6 +704,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
this.tec.getLog().put(FormulaLog.PARAM,result.entrySet().stream().map(p->logMap.get(p.getKey())+":"+p.getValue()).collect(Collectors.joining(";")));
|
|
|
/*元素动态绑定*/
|
|
|
/*绑定节点参数公式*/
|
|
|
+ total= new ArrayList<>(total.stream().collect(Collectors.toMap(WbsParam::getK, w -> w, (v1, v2) -> v2)).values());
|
|
|
this.bindParamFormula(total);
|
|
|
return result;
|
|
|
}
|
|
@@ -1759,6 +1760,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
total.addAll(wpsPrivate);
|
|
|
}
|
|
|
if(Func.isNotEmpty(total)){
|
|
|
+ total= new ArrayList<>(total.stream().collect(Collectors.toMap(WbsParam::getK, w -> w, (v1, v2) -> v2)).values());
|
|
|
List<ElementFormulaMapping> mappingList = this.elementFormulaMappingService.list(Wrappers.<ElementFormulaMapping>lambdaQuery().in(ElementFormulaMapping::getParamId,total.stream().map(WbsParam::getId).collect(Collectors.toList())));
|
|
|
if(Func.isNotEmpty(mappingList)){
|
|
|
list.forEach(e->{
|