获取扩展的关联质检资料的节点

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeContractVO2.java

@@ -24,6 +24,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.node.INode;
 import org.springblade.manager.entity.ArchiveTreeContract;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeansException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -194,4 +196,21 @@ public class ArchiveTreeContractVO2 implements INode<ArchiveTreeContractVO2> {
 				+ ")";
 	}
 
+	public ArchiveTreeContractVO2() {
+	}
+
+	public ArchiveTreeContractVO2(ArchiveTreeContract archiveTree) {
+		if (archiveTree == null) {
+			return;
+		}
+
+		try {
+			BeanUtils.copyProperties(archiveTree,this);
+			this.setTitle(archiveTree.getNodeName());
+
+		} catch (BeansException e) {
+			e.printStackTrace();
+		}
+	}
+
 }

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

@@ -264,6 +264,24 @@ public class ArTreeContractInitServiceImpl {
         }
     }
 
+
+    public ArchiveTreeContractVO2 getTree(List<ArchiveTreeContract> archiveTreeContracts) {
+        List<ArchiveTreeContractVO2> archiveTreeContractVO2List = new ArrayList<>();
+
+        for (ArchiveTreeContract archiveTreeContract:archiveTreeContracts) {
+            ArchiveTreeContractVO2 treeContractVO2 = new ArchiveTreeContractVO2(archiveTreeContract);
+            archiveTreeContractVO2List.add(treeContractVO2);
+        }
+
+        List<ArchiveTreeContractVO2> trees = ForestNodeMerger.merge(archiveTreeContractVO2List);
+
+        if (trees != null && trees.size() > 0) {
+           return trees.get(0);
+        }else {
+            return null;
+        }
+    }
+
     /**
      *
      * @param tenantId

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

@@ -105,7 +105,10 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 			}
 		}
 
+		ArchiveTreeContractVO2 newTree = arTreeContractInitService.getTree(archiveTreeContracts);
 
+		List<ArchiveTreeContract> addNodes = arTreeContractInitService.getContractProcExtNodes(tenantId,projectId,wbsId,newTree);
+		archiveTreeContracts.addAll(addNodes);
 		//todo 同步质检资料动态节点，处理文件提名
 
 		//todo 同步立卷规则