Merge remote-tracking branch 'origin/master' into master

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

@@ -53,5 +53,35 @@ public class ArchiveAutoRuleWbsServiceImpl extends BaseServiceImpl<ArchiveAutoRu
 		return page.setRecords(baseMapper.selectArchiveAutoRuleWbsPage(page, archiveAutoRuleWbs));
 	}
 
+	//TODO 归档树添加普通节点 需要同父级自动规则
+
+
+	/**
+	 * 归档树节点规则 系统级同步到项目级
+	 */
+	public void sysToProject(ArchiveTree sysTree,ArchiveTree projectTree){
+		//归档树节点同步规则注意：
+		//archive_auto_node_id 最高并卷规则节点ID以项目级节点ID的为主；
+
+		//archive_auto_type 保持一致
+		//select 保持一致
+		//groupId可以直接保留系统级的值，系统级到项目级都是一对一同步的。在项目目级新加节点按父节点规则为主。
+	}
+
+
+	//项目级同步到客户级:
+	//客户级归档树节点同步规则注意：
+	//archive_auto_node_id 最高并卷规则节点ID以客户级节点ID的为主；
+	//archive_auto_type 保持一致
+	//select 保持一致
+	//groupId客户级节点存在合同段Id的需要按合同段Id+groupID区分。
+
+
+
+
+
+
+
+
 
 }

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

@@ -219,6 +219,8 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 			String ancestors = parent.getAncestors() + StringPool.COMMA + archiveTreeContractDTO.getParentId();
 			archiveTreeContractDTO.setAncestors(ancestors);
 			archiveTreeContractDTO.setTreeSort(parent.getTreeSort());
+			archiveTreeContractDTO.setContractId(parent.getContractId());
+			archiveTreeContractDTO.setTreeCode(parent.getTreeCode());
 		}
 
 		archiveTreeContractDTO.setIsDeleted(BladeConstant.DB_NOT_DELETED);

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

@@ -788,6 +788,16 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
 
                     if(archiveAutoType!=null){
 
+                        if (StringUtils.isEmpty(wbsId) && projectId!= null && projectId != 0) {
+                            ProjectInfo projectInfo = projectInfoService.getOne(projectId);
+                            if (projectInfo!= null) {
+                                Long lWbsId = projectInfo.getReferenceWbsTemplateId();
+                                if (lWbsId != null) {
+                                    wbsId = projectInfo.getReferenceWbsTemplateId().toString();
+                                }
+                            }
+                        }
+
                         //获取wbs关联树
                         ArchiveTreeVO2 archiveTreeVO2 = getWbsArchiveTree(AuthUtil.getTenantId(),projectId,wbsNode2ArchiveTreeNodeId,wbsId,"1",Long.parseLong(archiveTree.getDisplayHierarchy()));
                         List<ArchiveTreeVO2> archiveTreeVO2List = new ArrayList<>();