增加字段

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTreeContract.java

@@ -124,9 +124,10 @@ public class ArchiveTreeContract extends BaseEntity {
 	*/
 	private Integer extType;
 	/**
-	* 扩展关联Id
+	* 扩展Id，如动态工序节点的wbsid
 	*/
 	private Long extId;
+
 	/**
 	* 自动立卷类型
 	*/
@@ -141,6 +142,15 @@ public class ArchiveTreeContract extends BaseEntity {
 	 */
 	private Integer archiveAutoSelect;
 
+	/**
+	 * 来源id，用于后续同步更新
+	 */
+	private Long fromId;
+	/**
+	 * 扩展Id铆钉的树节点id
+	 */
+	private Long extAttachId;
+
 
 	public ArchiveTreeContract() {
 	}
@@ -152,6 +162,7 @@ public class ArchiveTreeContract extends BaseEntity {
 
 		try {
 			BeanUtils.copyProperties(archiveTree,this);
+			this.fromId = archiveTree.getId();
 		} catch (BeansException e) {
 			e.printStackTrace();
 		}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -64,6 +64,8 @@
         <result column="ext_id" property="extId"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
+        <result column="from_id" property="fromId"/>
+        <result column="ext_attach_id" property="extAttachId"/>
     </resultMap>
 
     <resultMap id="ArchiveTreeContractVO2ResultMap" type="org.springblade.manager.vo.ArchiveTreeContractVO2">

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

@@ -74,6 +74,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 			archiveTree.setParentId(oldNewMap.get(archiveTreeVO.getParentId()));
 			archiveTree.setCreateUser(AuthUtil.getUserId());
 			archiveTree.setProjectId(projectId);
+
 			String anCenstors = archiveTreeVO.getAncestors();
 			if (StringUtils.isNotEmpty(anCenstors)) {
 				String newAnCenstors = "";

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

@@ -0,0 +1,33 @@
+package org.springblade.manager.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.manager.entity.ArchiveTree;
+import org.springblade.manager.entity.ArchiveTreeContract;
+import org.springblade.manager.entity.WbsTree;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class ArchiveTreeSupportServiceImpl {
+
+
+    public List<ArchiveTree> getProcArchiveTree(ArchiveTree rootNode,String displayHierarchy,List<WbsTree> nodes)
+    {
+        List<ArchiveTree> archiveTreeList = new ArrayList<>();
+        for (WbsTree node: nodes) {
+            ArchiveTree archiveTree = new ArchiveTree();
+            archiveTree.setExtType(1);
+            archiveTree.setExtId(node.getId());
+            archiveTree.setAncestors(rootNode.getId().toString());
+            archiveTreeList.add(archiveTree);
+        }
+
+        //设置pid
+
+        return archiveTreeList;
+    }
+
+}