ソースを参照

开放中间交工等的同步

huangtf 1 年間 前
コミット
63571e2a9b

+ 1 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO2.java

@@ -65,6 +65,7 @@ public class WbsTreeVO2 implements INode<WbsTreeVO2> {
     }
 
     public boolean isProcessType() {
+
         if (this.getMajorDataType() != null) {
             if (this.getMajorDataType() == 1
                     || this.getMajorDataType() == 2

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArTreeContractInitServiceImpl.java

@@ -425,9 +425,9 @@ public class ArTreeContractInitServiceImpl {
             if(wbsTreeVO2.getNodeType() == null){
                 continue;
             }
-            if (!wbsTreeVO2.isProcessType()) {
-                continue;
-            }
+//            if (!wbsTreeVO2.isProcessType()) {
+//                continue;
+//            }
 
             //只展示指定层级之上的
             if (!wbsTreeVO2.isMatchLevel(level)) {

+ 6 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -628,12 +628,12 @@ public class ArchiveTreeContractSyncImpl {
             if (current == null) {
                 return null; // 如果没有找到对应的节点,则返回 null
             }
-            if (current.getNodeType() <= nodeType &&
-                    ! (current.getNodeName().contains("中间交工")
-                            || current.getNodeName().contains("质量评定")
-                            || current.getNodeName().contains("开工报告")
-                            || current.getNodeName().contains("质量检验评定")
-                            || current.getNodeName().contains("质量验收评定"))
+            if (current.getNodeType() <= nodeType
+//                    && ! (current.getNodeName().contains("中间交工")
+//                            || current.getNodeName().contains("质量评定")
+//                            || current.getNodeName().contains("开工报告")
+//                            || current.getNodeName().contains("质量检验评定")
+//                            || current.getNodeName().contains("质量验收评定"))
                           ) {
                 return current.getPKeyId(); // 如果找到了符合要求的节点,则返回其 pKeyId 属性值
             }

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -403,9 +403,9 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
         for (WbsTreeVO2 wbsTreeVO2 : wbsTreeVO2List) {
             //只展示指定层级之上的
 
-            if (!wbsTreeVO2.isProcessType()) {
-                continue;
-            }
+//            if (!wbsTreeVO2.isProcessType()) {
+//                continue;
+//            }
 
             if (!wbsTreeVO2.isMatchLevel(level)) {
                 continue;