关联原生电子文件到归档

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -899,7 +899,7 @@
         e_visa_pdf_size
         from u_information_query
         where is_deleted = 0
-          and contract_id = #{contractId} and is_deleted = 0;
+          and contract_id = #{contractId} and status = 2 and is_deleted = 0;
     </select>
 
     <select id="getTabussTimeInfo" resultMap="tabBusstimeInfoResultMap">

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

@@ -396,9 +396,17 @@ public class ArTreeContractInitServiceImpl {
             }
         }
 
+        Long rootId = 0L;
         for (WbsTreeContractVO6 wbsTreeVO2 : wbsTreeContractVO6s) {
             //不要中间交工，质量评定和开工报告作为目录节点
             //wbsMap.put(wbsTreeVO2.getId(),wbsTreeVO2);
+
+            //修改配置
+            if (wbsTreeVO2.getParentId() == 0) {
+                rootId = wbsTreeVO2.getId();
+                continue;
+            }
+
             if(wbsTreeVO2.getNodeType() == null){
                 continue;
             }
@@ -432,7 +440,7 @@ public class ArTreeContractInitServiceImpl {
             archiveTree.setProjectId(projectId);
             archiveTree.setContractId(contractId);
             archiveTree.setId(oldNewMap.get(wbsTreeVO2.getId()));
-            if (wbsTreeVO2.getParentId() == 0) {
+            if (wbsTreeVO2.getParentId().equals(rootId)) {
                 archiveTree.setParentId(subTree.getId());
             } else {
                 archiveTree.setParentId(oldNewMap.get(wbsTreeVO2.getParentId()));