BUG

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -107,15 +107,19 @@ public class TrialSelfInspectionRecordServiceImpl
             record.setDetectionResultName(record.getDetectionResult().equals(1) ? "合格" : "不合格");
 
             //工程部位及用途名称
-            if (contractTreeList.size() > 0) {
+            if (contractTreeList.size() > 0 && ObjectUtil.isNotEmpty(record.getProjectPosition())) {
                 List<String> projectPositionNames = new ArrayList<>();
                 for (WbsTreeContract wbsTreeContract : contractTreeList) {
-                    if (String.valueOf(wbsTreeContract.getPKeyId()).contains(record.getProjectPosition())) {
+                    if ((record.getProjectPosition()).contains(String.valueOf(wbsTreeContract.getPKeyId()))) {
                         projectPositionNames.add(wbsTreeContract.getNodeName());
                     }
                 }
                 String name = projectPositionNames.stream().findAny().orElse(null);
-                record.setProjectPositionName(name + "等" + projectPositionNames.size() + "个工程部位信息");
+                if (projectPositionNames.size() > 1) {
+                    record.setProjectPositionName(name + "等" + projectPositionNames.size() + "个工程部位信息");
+                } else {
+                    record.setProjectPositionName(name);
+                }
             }
         }
         return trialSelfInspectionRecordVOIPage.setRecords(records);

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

@@ -249,7 +249,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 tableInfo.setProjectId(dataInfo2.getString("projectId"));
                 //huangjn 填报的类型，施工或监理
                 tableInfo.setClassify(dataInfo2.getString("classify"));
-                //huangjn 填报的类型，施工或监理
 
                 //设置首件信息
                 this.setFirstData(dataInfo2, tableInfo);

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

@@ -504,7 +504,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             }
             if (StringUtils.isNotEmpty(wbsId)) {
                 //获取当前参数表的所有业务数据
-                List<WbsParam> wbsParamListAll = wbsParamMapper.selectList(Wrappers.<WbsParam>query().lambda().eq(WbsParam::getType, 1));
+                List<WbsParam> wbsParamListAll = wbsParamMapper.selectList(Wrappers.<WbsParam>query().lambda().eq(WbsParam::getType, 1).isNotNull(WbsParam::getNodeId).ne(WbsParam::getNodeId, -1));
 
                 List<WbsParam> paramListData = new ArrayList<>();
                 //获取公有树
@@ -1230,7 +1230,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             wbsPrivate.setPKeyId(pKeyId1);
 
             wbsPrivate.setTableOwner(tableInfo.getTableOwner());
-            wbsPrivate.setInitTableId(tableInfo.getId()+"");
+            wbsPrivate.setInitTableId(tableInfo.getId() + "");
             wbsPrivate.setTableType(tableInfo.getTabType());
             wbsPrivate.setInitTableName(tableInfo.getTabEnName());
             wbsPrivate.setNodeName(tableInfo.getTabChName());

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

@@ -308,7 +308,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<WbsFormElementVO> selectFormElements(String id,Long nodeId) {
+    public List<WbsFormElementVO> selectFormElements(String id, Long nodeId) {
         List<WbsFormElementVO> wbsFormElements = wbsTreeMapper.selectFormElements(id);
         wbsFormElements.forEach(elements -> {
             String eAllowDeviation = elements.getEAllowDeviation();
@@ -317,30 +317,29 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             if (escapeChar != null) {
                 elements.setEAllowDeviation(escapeChar);
             }
-            if(nodeId!=null&&com.mixsmart.utils.StringUtils.isNotEquals(nodeId,elements.getNodeId())){
+            if (nodeId != null && com.mixsmart.utils.StringUtils.isNotEquals(nodeId, elements.getNodeId())) {
                 /*与当前节点不相同，则认为是跨节点取数，当然跨节点位置的标记不仅有绑定节点id一种方式*/
-                elements.setTableElementKey(elements.getNodeId()+StringPool.COLON+elements.getTableElementKey());
+                elements.setTableElementKey(elements.getNodeId() + StringPool.COLON + elements.getTableElementKey());
             }
         });
-             String elementIds = wbsFormElements.stream().map(WbsFormElement::getId).map(String::valueOf).collect(Collectors.joining(","));
-             if(Func.isNotEmpty(elementIds)) {
-                 List<Long> longs = this.jdbcTemplate.queryForList("select a.id from m_wbs_form_element a inner join m_element_formula_mapping b on a.id=b.element_id where a.id in(" + elementIds + ") and b.scope=1", Long.class);
-                 wbsFormElements.forEach(e -> {
-                     e.setGlobalFormula(longs.contains(e.getId()) ? 1 : 0);
-                 });
-                 List<Long> longs2 = this.jdbcTemplate.queryForList("select c.element_id from m_wbs_tree a INNER JOIN m_wbs_tree b on a.parent_id=b.id INNER JOIN m_element_formula_mapping c on b.id=c.node_id where  a.id=" + id + " and c.scope=10 and c.element_id in(" + elementIds + ")", Long.class);
-                 wbsFormElements.forEach(e -> {
-                     e.setIsSaveFormula(longs2.contains(e.getId()) ? 1 : 0);
-                 });
-             }
-             return wbsFormElements;
+        String elementIds = wbsFormElements.stream().map(WbsFormElement::getId).map(String::valueOf).collect(Collectors.joining(","));
+        if (Func.isNotEmpty(elementIds)) {
+            List<Long> longs = this.jdbcTemplate.queryForList("select a.id from m_wbs_form_element a inner join m_element_formula_mapping b on a.id=b.element_id where a.id in(" + elementIds + ") and b.scope=1", Long.class);
+            wbsFormElements.forEach(e -> {
+                e.setGlobalFormula(longs.contains(e.getId()) ? 1 : 0);
+            });
+            List<Long> longs2 = this.jdbcTemplate.queryForList("select c.element_id from m_wbs_tree a INNER JOIN m_wbs_tree b on a.parent_id=b.id INNER JOIN m_element_formula_mapping c on b.id=c.node_id where  a.id=" + id + " and c.scope=10 and c.element_id in(" + elementIds + ")", Long.class);
+            wbsFormElements.forEach(e -> {
+                e.setIsSaveFormula(longs2.contains(e.getId()) ? 1 : 0);
+            });
+        }
+        return wbsFormElements;
     }
 
 
     @Override
     public List<WbsFormElementVO> selectPrivateFormElements(String id) {
-        List<WbsFormElementVO> wbsFormElements = wbsTreeMapper.selectPrivateFormElements(id);
-        return wbsFormElements;
+        return wbsTreeMapper.selectPrivateFormElements(id);
     }
 
     @Override
@@ -571,6 +570,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                                 wbsTreePrivate.setWbsType(String.valueOf(pawDTO.getWbsType()));
                                 wbsTreePrivate.setProjectId(pawDTO.getProjectId());
                                 wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
+                                wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
                             }
                             insertData1.add(wbsTreePrivate);
                         });
@@ -612,6 +612,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                                 wbsTreePrivate.setWbsType(String.valueOf(pawDTO.getWbsType()));
                                 wbsTreePrivate.setProjectId(pawDTO.getProjectId());
                                 wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
+                                wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
 
                                 insertData2.add(wbsTreePrivate);
 
@@ -794,7 +795,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         String newTableName = "m_" + DateUtil.time() + "_" + SnowFlakeUtil.getId();
         formElementDTO.setInitTableName(newTableName);
         // 新增时
-        if (formElementDTO.getId()==null || StringUtils.isEmpty(formElementDTO.getId()+"")) {
+        if (formElementDTO.getId() == null || StringUtils.isEmpty(formElementDTO.getId() + "")) {
             formElementDTO.setInitTableId(newPkId);
         }