Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpProjectNodesServiceImpl.java

@@ -473,6 +473,16 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
         //项目信息
         Map<String, Object> project = this.getBaseMapper().getProjectByProjectId(projectId);
         if(ObjectUtil.isNotNull(project)) {
+            if(ObjectUtil.isNull(project.get("PROJECT_EN_NAME"))) {
+                project.put("PROJECT_EN_NAME", "");
+            }
+            StringBuilder sb = new StringBuilder();
+            sb.append("Inspection and Test Plan for ");
+            sb.append(StringUtils.toString(project.get("PROJECT_EN_NAME"), ""));
+            sb.append(StringUtils.toString(project.get("PROJECT_CODE"), ""));
+            sb.append(StringUtils.toString(project.get("PROJECT_ENAME"), ""));
+            sb.append("检验和测试计划");
+            project.put("projectTitle", sb.toString());
             mainList.add(project);
         } else {
             mainList.add(Collections.emptyMap());
@@ -484,7 +494,7 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
         //获取项目下报验点
         LambdaQueryWrapper<ZhcxItpProjectNodesDo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ZhcxItpProjectNodesDo::getProjectid, projectId)
-                .eq(ZhcxItpProjectNodesDo::getDeleted, "0");
+                .eq(ZhcxItpProjectNodesDo::getDeleted, "0").orderByAsc(ZhcxItpProjectNodesDo::getSortindex);
         List<ZhcxItpProjectNodesDo> projectNodes = list(queryWrapper);
 
         for(ZhcxItpProjectNodesDo node : projectNodes) {
@@ -521,14 +531,24 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
             } else {
                 if(ObjectUtil.isEmpty(nodesDo.getPnodeid())) {
                     //构件
-                    nodeExtVo.setL2NodeName(nodesDo.getNodename());
+                    nodeExtVo.setL2NodeName(nodesDo.getNodename().concat("\n").concat(StringUtils.toString(nodesDo.getEnname(), "")));
                     //阶段
                     ZhcxItpProjectNodesDo l1node = map.get(nodesDo.getPid());
-                    nodeExtVo.setL1NodeName(l1node.getNodename());
+                    nodeExtVo.setL1NodeName(l1node.getNodename().concat("\n").concat(StringUtils.toString(nodesDo.getEnname(), "")));
                 } else {
                     //大小构件
                     ZhcxItpProjectNodesDo pnode = map.get(nodesDo.getPnodeid());
-                    nodeExtVo.setL2NodeName(pnode.getNodename().concat("/").concat(nodesDo.getNodename()));
+
+                    String l2Nodename = pnode.getNodename().concat("/").concat(nodesDo.getNodename());
+
+                    List<String> ennameList = new ArrayList<>();
+                    if(ObjectUtil.isNotEmpty(pnode.getEnname())) {
+                        ennameList.add(pnode.getEnname());
+                    }
+                    if(ObjectUtil.isNotEmpty(nodesDo.getEnname())) {
+                        ennameList.add(nodesDo.getEnname());
+                    }
+                    nodeExtVo.setL2NodeName(l2Nodename.concat("\n").concat(StringUtils.join(ennameList, "/")));
 
                     //阶段
                     ZhcxItpProjectNodesDo l1node = map.get(pnode.getPid());
@@ -537,6 +557,8 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
 
             }
 
+            nodeExtVo.setNodename(node.getNodename().concat("\n").concat(StringUtils.toString(node.getEnname(), "")));
+
             nodeExtVo.setIdx(count);
             nodeExtVo.setTypeOfQc("H");
             Map<String, Object> map1 = JSONUtils.toEntity(nodeExtVo, Map.class);