关联质检资料

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

@@ -152,6 +152,11 @@ public class ArchiveTreeContract extends BaseEntity {
      */
     private Long extId;
 
+    /**
+     * 扩展Id，如动态工序节点的wbs树的pkid
+     */
+    private Long extKeyId;
+
     /**
      * 自动立卷类型 1最高 2分类并卷 3单独组卷   说明：1规则下可以有2或3；2和3两种规则互斥,2下不能有3,3下不能有2；
      */

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

@@ -171,6 +171,12 @@ public class ArchiveTreeContractVO2 implements INodeEx<ArchiveTreeContractVO2> {
      */
     @ApiModelProperty(value = "扩展关联Id")
     private Long extId;
+
+    /**
+     * 扩展Id，如动态工序节点的wbs树的pkid
+     */
+    @ApiModelProperty(value = "扩展关联PkId")
+    private Long extKeyId;
     /**
      * 自动立卷类型
      */

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

@@ -48,6 +48,7 @@
         <result column="reviewer" property="reviewer"/>
         <result column="specification" property="specification"/>
         <result column="archive_name_suffix" property="archiveNameSuffix"/>
+        <result column="ext_key_id" property="extKeyId"/>
     </resultMap>
 
 
@@ -100,6 +101,7 @@
         <result column="storage_type" property="storageType"/>
         <result column="ext_type" property="extType"/>
         <result column="ext_id" property="extId"/>
+        <result column="ext_key_id" property="extKeyId"/>
         <result column="exp_data_type" property="expDataType"/>
         <result column="from_id" property="fromId"/>
         <result column="archive_auto_type" property="archiveAutoType"/>

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

@@ -105,4 +105,6 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
     String getAuthCode(Long contractId);
 
     List<ArchiveTreeContract> getArchiveTreeContractListByIds(String ids);
+
+    List<ArchiveTreeContract> getWbsAssociatedNodes(String contractId);
 }

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

@@ -320,7 +320,8 @@ public class ArTreeContractInitServiceImpl {
             //关联质检资料
             if (ar.getAssociationType() != null
                     && ar.getAssociationType() == 1
-                    && ar.getDisplayHierarchy() != null) {
+                    && ar.getDisplayHierarchy() != null
+                    &&  ar.getStorageType() != null &&  ar.getStorageType() == 4) {
                 List<ArchiveTreeContract> tmpList = getTreeContractFromWbs(tenantId, projectId, wbsId, ar);
                 addNodes.addAll(tmpList);
             }
@@ -389,6 +390,8 @@ public class ArTreeContractInitServiceImpl {
         //获取已经存在的
         Map<Long, ArchiveTreeContractVO2> extMap = new LinkedHashMap<>();
         Map<Long, Long> oldNewMap = new LinkedHashMap<>();
+        Map<Long, Long> id2PkidMap = new LinkedHashMap<>();
+
         //Map<Long,WbsTreeContractVO6> wbsMap = new LinkedHashMap<>();
         //以前增加的wbs节点映射 放在oldNewMap
         for (ArchiveTreeContractVO2 ar : treeContractVO2s) {
@@ -459,8 +462,9 @@ public class ArTreeContractInitServiceImpl {
             //设置关联
             archiveTree.setExtType(1);
             archiveTree.setExtId(wbsTreeVO2.getId());
-            archiveTree.setSort(wbsTreeVO2.getSort());
+            archiveTree.setExtKeyId(wbsTreeVO2.getId());
             archiveTree.setExtAttachId(subTree.getId());
+            archiveTree.setSort(wbsTreeVO2.getSort());
             archiveTree.setDisplayHierarchy(level.toString());
             archiveTree.setIsDeleted(0);
             //上传节点

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

@@ -945,5 +945,36 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 
 	}
 
+	/**
+	 * 返回关联质检资料的节点
+	 * @param contractId
+	 * @return
+	 */
+	@Override
+	public List<ArchiveTreeContract> getWbsAssociatedNodes(String contractId) {
+		return baseMapper.selectList(Wrappers.<ArchiveTreeContract>query().lambda().eq(ArchiveTreeContract::getAssociationType, 1)
+				.isNotNull(ArchiveTreeContract::getDisplayHierarchy)
+				.eq(ArchiveTreeContract::getIsDeleted, 0)
+				.eq(ArchiveTreeContract::getContractId, contractId)
+				.eq(ArchiveTreeContract::getStorageType, 4));
+	}
+
+	/**
+	 * 返回关联质检资料的节点
+	 * @param contractId
+	 * @return
+	 */
+
+	public ArchiveTreeContract getWbsNode(String contractId,Long pkId) {
+		List<ArchiveTreeContract> archiveTreeContracts =  baseMapper.selectList(Wrappers.<ArchiveTreeContract>query().lambda()
+				.eq(ArchiveTreeContract::getContractId, contractId)
+				.eq(ArchiveTreeContract::getIsDeleted, 0)
+				.eq(ArchiveTreeContract::getExtKeyId, pkId));
+		if (archiveTreeContracts == null || archiveTreeContracts.size() ==0) {
+			return null;
+		}
+		return archiveTreeContracts.get(0);
+	}
+
 
 }