更新字段

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

@@ -155,9 +155,9 @@ public class ArchiveTreeContract extends BaseEntity {
 	 */
 	private Integer archiveAutoGroupSelect;
 
-//
-//	//系统级模板Id
-//	private Long originId;
+
+	//系统级模板Id
+	private Long baseId;
 	/**
 	 * 来源id，项目级，用于后续同步更新
 	 */
@@ -188,6 +188,7 @@ public class ArchiveTreeContract extends BaseEntity {
 		try {
 			BeanUtils.copyProperties(archiveTree,this);
 			this.fromId = archiveTree.getId();
+			this.baseId = archiveTree.getFromId();
 		} catch (BeansException e) {
 			e.printStackTrace();
 		}

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

@@ -175,4 +175,9 @@ public class ArchiveTreeVO2 implements INode<ArchiveTreeVO2> {
 
     private String expDataType;
 
+    /**
+     * 来源ID
+     */
+    private Long fromId;
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java

@@ -138,7 +138,7 @@ public class ArchiveTreeController extends BladeController {
     })
     public R<List<ArchiveTreeVO2>> tree(Long projectId,Integer disPlayTree, Integer nodeType,String wbsId) {
 
-        List<ArchiveTreeVO2> tree = archiveTreeService.tree2(AuthUtil.getTenantId(),projectId, disPlayTree, nodeType,wbsId);
+        List<ArchiveTreeVO2> tree = archiveTreeService.tree2(AuthUtil.getTenantId(),projectId, disPlayTree, nodeType,wbsId,true);
         if (tree != null && tree.size() > 0) {
             return R.data(tree);
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ArchiveTreeClientImpl.java

@@ -41,6 +41,6 @@ public class ArchiveTreeClientImpl implements ArchiveTreeClient {
 
     @Override
     public R<List<ArchiveTreeVO2>> tree(Long projectId,Integer disPlayTree, Integer nodeType) {
-        return R.data(this.archiveTreeService.tree2(AuthUtil.getTenantId(),projectId, disPlayTree, nodeType,null));
+        return R.data(this.archiveTreeService.tree2(AuthUtil.getTenantId(),projectId, disPlayTree, nodeType,null,false));
     }
 }

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

@@ -35,6 +35,7 @@
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
         <result column="exp_data_type" property="expDataType"/>
+        <result column="from_id" property="fromId"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
         <result column="archive_auto_group_select" property="archiveAutoGroupSelect"/>
@@ -89,8 +90,11 @@
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
         <result column="exp_data_type" property="expDataType"/>
+        <result column="from_id" property="fromId"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
+        <result column="archive_auto_group_select" property="archiveAutoGroupSelect"/>
+        <result column="archive_auto_group_id" property="archiveAutoGroupId"/>
     </resultMap>
 
     <resultMap id="getAllSonNodeforGroupViewResultMap" type="org.springblade.manager.vo.ArchiveTreeContractAutoRuleVO">
@@ -186,6 +190,8 @@
         d.exp_data_type,
         d.archive_auto_type,
         d.archive_auto_node_id,
+        d.archive_auto_group_select,
+        d.archive_auto_group_id,
         (SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_archive_tree_contract WHERE parent_id = d.id and is_deleted = 0 and project_id = #{projectId})
         AS "has_children"
         FROM
@@ -221,7 +227,9 @@
         ext_id,
         exp_data_type,
         archive_auto_type,
-        archive_auto_node_id
+        archive_auto_node_id,
+        archive_auto_group_select,
+        archive_auto_group_id
         FROM m_archive_tree_contract
         WHERE is_deleted = 0 and project_id = #{projectId}
         <if test=" tenantId!=null and tenantId!='' ">

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

@@ -244,6 +244,7 @@
         project_type,
         storage_type,
         association_type,
+        from_id,
         ext_type,
         ext_id,
         exp_data_type,

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeService.java

@@ -20,7 +20,7 @@ public interface IArchiveTreeService extends BaseService<ArchiveTree> {
 //	List<ArchiveTreeVO> tree(String tenantI, Integer disPlayTree, Integer nodeType);
 
 	List<ArchiveTreeVO2> lazyTree2(String tenantId, Long projectId, Long parentId, Long extId,Long level);
-	List<ArchiveTreeVO2> tree2(String tenantI, Long projectId, Integer disPlayTree, Integer nodeType,String wbsId);
+	List<ArchiveTreeVO2> tree2(String tenantI, Long projectId, Integer disPlayTree, Integer nodeType,String wbsId,boolean bgetExtNodes);
 
 	List<ArchiveTree> selectByParentIdOrId(String id);
 

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

@@ -81,7 +81,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	@Override
 	public boolean initTree2(String tenantId, Long projectId){
 
-		List<ArchiveTreeVO2> tree = archiveTreeService.tree2(AuthUtil.getTenantId(), projectId,null, null,null);
+		List<ArchiveTreeVO2> tree = archiveTreeService.tree2(AuthUtil.getTenantId(), projectId,null, null,null,false);
 		if (tree == null || tree.size() == 0) {
 			return false;
 		}

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

@@ -131,6 +131,8 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
             archiveTrees.add(archiveTree);
         }
 
+        //todo 同步立卷规则
+
         this.saveBatch(archiveTrees);
 
         return true;
@@ -147,7 +149,7 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
             throw new ServiceException("根节点已存在,请先删除后再进行初始化");
         }
 
-        List<ArchiveTreeVO2> sysTrees = this.tree2(AuthUtil.getTenantId(), projectId,null, null,null);
+        List<ArchiveTreeVO2> sysTrees = this.tree2(AuthUtil.getTenantId(), projectId,null, null,null,false);
         if (sysTrees == null || sysTrees.size() == 0) {
             return false;
         }
@@ -230,12 +232,12 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
 //    }
 
     @Override
-    public List<ArchiveTreeVO2> tree2(String tenantId,Long projectId, Integer disPlayTree, Integer nodeType,String wbsId) {
+    public List<ArchiveTreeVO2> tree2(String tenantId,Long projectId, Integer disPlayTree, Integer nodeType,String wbsId,boolean bgetExtNodes) {
         List<ArchiveTreeVO2> archiveTreeVOList = baseMapper.tree2(tenantId, projectId,disPlayTree, nodeType);
         List<ArchiveTreeVO2> treeVO2s = ForestNodeMerger.merge(archiveTreeVOList);
         //todo 遍历树，找到质检节点，调用getWbsArchiveTree，根据关联层级，拼接上去
-        //待传入wbsId,把child 加入ar的childred
-        if (StringUtils.isEmpty(wbsId) && projectId != 0) {
+        //是否获取扩展的wbs节点
+        if (StringUtils.isEmpty(wbsId) && projectId != 0 && bgetExtNodes) {
             ProjectInfo projectInfo = projectInfoService.getOne(projectId);
             if (projectInfo!= null) {
                 Long lWbsId = projectInfo.getReferenceWbsTemplateId();