新增字段

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

@@ -151,5 +151,11 @@ public class ArchiveTree extends BaseEntity {
     @ApiModelProperty(value = "是否为设置的节点")
     private Integer archiveAutoSelect;
 
+    /**
+     * 试验资料类型
+     */
+    @ApiModelProperty(value = "试验资料类型,‘使用逗号拼接’")
+    private String expDataType;
+
 
 }

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

@@ -19,6 +19,7 @@ package org.springblade.manager.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -152,6 +153,11 @@ public class ArchiveTreeContract extends BaseEntity {
 	 */
 	private Long extAttachId;
 
+	/**
+	 * 试验资料类型
+	 */
+	private String expDataType;
+
 
 	public ArchiveTreeContract() {
 	}

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

@@ -156,6 +156,8 @@ public class ArchiveTreeContractVO2 implements INode<ArchiveTreeContractVO2> {
 	@ApiModelProperty(value = "祖级列表id")
 	private String ancestors;
 
+	private String expDataType;
+
 	public String toString() {
 		return "TreeNode(parentId=" + this.getParentId()
 				+ ",ancestors" + this.getAncestors()

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

@@ -159,4 +159,6 @@ public class ArchiveTreeVO2 implements INode<ArchiveTreeVO2> {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    private String expDataType;
+
 }

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

@@ -199,17 +199,6 @@ public class ArchiveTreeContractController extends BladeController {
 		return R.fail(200, "初始化成功");
 	}
 
-	@GetMapping("/test1")
-	public R test1(){
-		Long projectId = 1578599210897772545L;
-		List<ArchiveTreeContractVO> tree = archiveTreeContractService.tree(AuthUtil.getTenantId(), null, null,projectId);
-		if (tree != null && tree.size() > 0) {
-			return R.data(tree);
-		}
-
-		return R.fail(200, "初始化成功");
-	}
-
 
 	/**
 	 * 保存立卷规则设置

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

@@ -34,6 +34,7 @@
         <result column="storage_type" property="storageType"/>
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
+        <result column="exp_data_type" property="expDataType"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
         <result column="archive_auto_select" property="archiveAutoSelect"/>
@@ -86,6 +87,7 @@
         <result column="storage_type" property="storageType"/>
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
+        <result column="exp_data_type" property="expDataType"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
     </resultMap>
@@ -171,6 +173,7 @@
         d.storage_type,
         d.ext_type,
         d.ext_id,
+        d.exp_data_type,
         d.archive_auto_type,
         d.archive_auto_node_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})
@@ -204,6 +207,7 @@
         storage_type,
         ext_type,
         ext_id,
+        exp_data_type,
         archive_auto_type,
         archive_auto_node_id
         FROM m_archive_tree_contract
@@ -218,7 +222,7 @@
             /*根节点=0 关联电子原生文件=1 数字化上传文件=2*/
             AND node_type in (0,#{nodeType})
         </if>
-        OR parent_id = 0
+        OR ( parent_id = 0 AND project_id = #{projectId} )
         ORDER BY sort
     </select>
     <update id="updateAllSonNodeIdsForArchiveAutoRule">

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

@@ -31,6 +31,7 @@
         <result column="storage_type" property="storageType"/>
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
+        <result column="exp_data_type" property="expDataType"/>
         <result column="archive_auto_type" property="archiveAutoType"/>
         <result column="archive_auto_node_id" property="archiveAutoNodeId"/>
         <result column="archive_auto_select" property="archiveAutoSelect"/>
@@ -51,6 +52,7 @@
         <result column="isStorageNode" property="isStorageNode"/>
         <result column="isBuiltDrawing" property="isBuiltDrawing"/>
         <result column="association_type" property="associationType"/>
+        <result column="exp_data_type" property="expDataType"/>
         <result column="postType" property="postType"/>
         <result column="project_type" property="projectType"/>
         <result column="storage_type" property="storageType"/>
@@ -196,6 +198,7 @@
         d.storage_type,
         d.ext_type,
         d.ext_id,
+        d.exp_data_type,
         d.archive_auto_type,
         d.archive_auto_node_id,
         d.archive_auto_select,
@@ -232,6 +235,7 @@
         storage_type,
         ext_type,
         ext_id,
+        exp_data_type,
         archive_auto_type,
         archive_auto_node_id,
         archive_auto_select,

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

@@ -64,6 +64,15 @@ public class ArTreeContractInitServiceImpl {
         return archiveTreeList;
     }
 
+    /**
+     *
+     * @param tenantId
+     * @param projectId
+     * @param projectName
+     * @param tree
+     * @param archiveTreeContracts
+     * @param contracts
+     */
     public void copyTree(String tenantId, Long projectId, String projectName, ArchiveTreeVO2 tree, List<ArchiveTreeContract> archiveTreeContracts,
                                               List<ContractInfo> contracts){
 
@@ -122,6 +131,17 @@ public class ArTreeContractInitServiceImpl {
         return;
 
     }
+
+    /**
+     *
+     * @param tenantId
+     * @param projectId
+     * @param contractInfo
+     * @param newRootId
+     * @param child
+     * @param archiveTreeContracts
+     * @param oldNewMap
+     */
     public void copyContractTree(String tenantId, Long projectId, ContractInfo contractInfo ,Long newRootId,
                           List<ArchiveTreeVO2> child,List<ArchiveTreeContract> archiveTreeContracts,Map<Long,Long> oldNewMap){
         ArchiveTreeContract contractNode = new ArchiveTreeContract();
@@ -134,6 +154,7 @@ public class ArTreeContractInitServiceImpl {
         contractNode.setParentId(newRootId);
         contractNode.setProjectId(projectId);
         contractNode.setContractId(contractInfo.getId());
+        contractNode.setIsDeleted(0);
         archiveTreeContracts.add(contractNode);
 
         if (child == null || child.size() == 0) {
@@ -150,6 +171,16 @@ public class ArTreeContractInitServiceImpl {
         copyChild(tenantId,projectId,contractInfo.getId(),contractNode.getId(),childList,archiveTreeContracts,null);
     }
 
+    /**
+     *
+     * @param tenantId
+     * @param projectId
+     * @param contractId
+     * @param newRootId
+     * @param child
+     * @param archiveTreeContracts
+     * @param oldNewMap
+     */
     public void copyNormalTree(String tenantId, Long projectId, Long contractId, Long newRootId, List<ArchiveTreeVO2> child,
                           List<ArchiveTreeContract> archiveTreeContracts, Map<Long,Long> oldNewMap){
 
@@ -209,6 +240,10 @@ public class ArTreeContractInitServiceImpl {
 
     }
 
+    /**
+     *
+     * @param archiveTreeContracts
+     */
     public void InitAncestors(List<ArchiveTreeContract> archiveTreeContracts) {
         List<ArchiveTreeContractVO2> archiveTreeContractVO2List = new ArrayList<>();
         Map<Long,ArchiveTreeContractVO2> vo2Map = new LinkedHashMap<>();
@@ -233,6 +268,11 @@ public class ArTreeContractInitServiceImpl {
         }
     }
 
+    /**
+     *
+     * @param tree
+     * @param ancestors
+     */
     public void InitAncestors(ArchiveTreeContractVO2 tree, String ancestors) {
         String localAncestors = ancestors + "," + tree.getId();
         tree.setAncestors(ancestors);