质检-表单设置

1、公式过滤调整

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1088,7 +1088,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     @Override
     public void gsColor(Long pKeyId, String nodeId, String projectId, Document doc) {
         try {
-            List<KeyMapper> keyMappers = this.formulaService.getKeyMapperList(Collections.singletonList(pKeyId), projectId, nodeId, ExecuteType.INSPECTION, "0");
+            List<KeyMapper> keyMappers = this.formulaService.getKeyMapperList(Collections.singletonList(pKeyId), projectId, nodeId, ExecuteType.INSPECTION, "1");
             //扩展----根据父节点查询不允许执行的公式
             WbsTreeContractExtend byId = wbsTreeContractExtendService.getById(nodeId);
             List<String> list;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -5274,8 +5274,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     /*表id,项目id,节点Id*/
     public List<KeyMapper> listForContract(List<Long> ids, String projectId, String nodeId, String testGroupId) {
         List<Map<String, Object>> listMap = listMap(ids, ExecuteType.INSPECTION);
-        //质检这个参数为null，表示过滤公式，不为null，表示html渲染表格
-        if(testGroupId == null){
+        //质检这个参数为0，表示过滤公式，为1，表示html渲染表格
+        if(!"1".equals(testGroupId)){
             //根据节点id查询 合同段扩展表
             WbsTreeContractExtend byId = wbsTreeContractExtendService.getById(nodeId);
             if (byId != null && StringUtils.isNotEmpty(byId.getFormulaConfig())) {