|
@@ -796,9 +796,17 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
List<FormData> simple = map.get(false);
|
|
List<FormData> simple = map.get(false);
|
|
if (CollectionUtil.isNotEmpty(simple)) {
|
|
if (CollectionUtil.isNotEmpty(simple)) {
|
|
for(FormData fd:simple){
|
|
for(FormData fd:simple){
|
|
- if(fd.getCoordsList().size()==1&&fd.executable()&&fd.getFormula().getFormula().contains(WP)&&!fd.empty()){
|
|
|
|
- fd.setFinished(true);
|
|
|
|
- fd.setUpdate(1);
|
|
|
|
|
|
+ if(!tec.force&&fd.executable()&&fd.getFormula().getFormula().contains(WP)){
|
|
|
|
+ /*节点公式已经生成过就自动填充,无需再计算*/
|
|
|
|
+ Optional<Object> op= fd.getValues().stream().map(ElementData::getValue).filter(Func::isNotEmpty).findAny();
|
|
|
|
+ if(op.isPresent()) {
|
|
|
|
+ for(ElementData ed:fd.getValues()){
|
|
|
|
+ ed.setValue(op.get());
|
|
|
|
+ }
|
|
|
|
+ fd.getFormula().setOutm(1);
|
|
|
|
+ fd.setFinished(true);
|
|
|
|
+ fd.setUpdate(1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
tec.formDataList.addAll(simple);
|
|
tec.formDataList.addAll(simple);
|