外部报验功能-报验点

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

@@ -534,7 +534,7 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
                     nodeExtVo.setL2NodeName(nodesDo.getNodename().concat("\n").concat(StringUtils.toString(nodesDo.getEnname(), "")));
                     //阶段
                     ZhcxItpProjectNodesDo l1node = map.get(nodesDo.getPid());
-                    nodeExtVo.setL1NodeName(l1node.getNodename().concat("\n").concat(StringUtils.toString(nodesDo.getEnname(), "")));
+                    nodeExtVo.setL1NodeName(l1node.getNodename().concat("\n").concat(StringUtils.toString(l1node.getEnname(), "")));
                 } else {
                     //大小构件
                     ZhcxItpProjectNodesDo pnode = map.get(nodesDo.getPnodeid());
@@ -552,7 +552,7 @@ public class ZhcxItpProjectNodesServiceImpl extends ServiceImpl<ZhcxItpProjectNo
 
                     //阶段
                     ZhcxItpProjectNodesDo l1node = map.get(pnode.getPid());
-                    nodeExtVo.setL1NodeName(l1node.getNodename());
+                    nodeExtVo.setL1NodeName(l1node.getNodename().concat(StringUtils.toString(l1node.getEnname(), "")));
                 }
 
             }

business-entity/src/main/java/com/rongwei/bsentity/vo/ZhcxItpProjectNodeTreeVO.java

@@ -0,0 +1,16 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.ZhcxItpProjectNodesDo;
+import lombok.*;
+
+import java.util.List;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ZhcxItpProjectNodeTreeVO extends ZhcxItpProjectNodesDo {
+
+    private List<ZhcxItpProjectNodeTreeVO> children;
+}