liuyc преди 3 години
родител
ревизия
cb66815d5c

+ 5 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsFormElementVO.java

@@ -42,4 +42,9 @@ public class WbsFormElementVO extends WbsFormElement {
      */
     private String initTableName;
 
+    /**
+     * 是否保存过公式 '0'否 '1'是
+     */
+    private Integer isSaveFormula;
+
 }

+ 13 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -45,6 +45,7 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.excel.WbsExcelBatchUtil;
 import org.springblade.manager.excel.WbsExcelUtil;
 import org.springblade.manager.mapper.*;
+import org.springblade.manager.service.IFormulaService;
 import org.springblade.manager.service.IWbsFormElementService;
 import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -78,6 +79,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private final ProjectInfoMapper projectInfoMapper;
     private final WbsTreeContractMapper wbsTreeContractMapper;
     private final ContractInfoMapper contractInfoMapper;
+    private final FormulaMapper formulaMapper;
 
 
     @Override
@@ -442,7 +444,18 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             if (escapeChar != null) {
                 elements.setEAllowDeviation(escapeChar);
             }
+            //是否保存过公式
+            List<Formula> formulas = formulaMapper.selectList(Wrappers.<Formula>query().lambda()
+                    .eq(Formula::getElementId, elements.getId())
+                    .eq(Formula::getStatus, 1)
+            );
+            if (formulas.size() > 0) {
+                elements.setIsSaveFormula(1);
+            } else {
+                elements.setIsSaveFormula(0);
+            }
         });
+
         return wbsFormElements;
     }