修改同步

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/InformationQueryClient.java

@@ -86,5 +86,5 @@ public interface InformationQueryClient {
     List<QueryProcessDataVO> getNodeChildTabColsAllByTabName(@RequestParam String initTabName);
 
     @PostMapping(API_PREFIX + "/getInformationByContractId")
-    List<InformationQuery> getInformationByContractId(Long contractId);
+    List<InformationQuery> getInformationByContractId(@RequestParam Long contractId);
 }

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

@@ -321,4 +321,16 @@ public class ArchiveTreeContractVO2 implements INodeEx<ArchiveTreeContractVO2> {
         this.flag = 1;
     }
 
+    public boolean IsQualityAssociationNode() {
+        if (this.getAssociationType() != null
+                && this.getAssociationType() == 1
+                && this.getDisplayHierarchy() != null
+                && (this.getStorageType()!= null && this.getStorageType() == 4)){
+            return true;
+        }
+        return  false;
+
+
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1053,12 +1053,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
         List<String> listFiles = new ArrayList<>();
         listFiles.add(query.getEVisaPdfUrl());
-        Long fileSize = FileUtils.getOssFileSizeCount(listFiles);
+        //Long fileSize = FileUtils.getOssFileSizeCount(listFiles);
 
         if (archiveFile != null) {
             archiveFile.setEVisaFile(query.getEVisaPdfUrl());
             archiveFile.setPdfFileUrl(query.getEVisaPdfUrl()); // 这里将pdfFileUrl也更新了，因为需求中没有限制只能更新eVisaFile属性
-            archiveFile.setFileSize(fileSize);
+            archiveFile.setFileSize(query.getEVisaPdfSize());
             this.archiveFileService.updateById(archiveFile);
 
         } else {
@@ -1067,7 +1067,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             if (wbsTreeContract!= null ) {
                 createTime = wbsTreeContract.getCreateTime();
             }
-            archiveFile = getArchiveFile(query,nodeId,keyId,fileSize,contractIndfo.archivesUnit(),createTime);
+            archiveFile = getArchiveFile(query,nodeId,keyId,query.getEVisaPdfSize(),contractIndfo.archivesUnit(),createTime);
             this.archiveFileService.save(archiveFile);
         }
     }

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

@@ -245,7 +245,7 @@ public class ArchiveTreeContractController extends BladeController {
             @ApiImplicitParam(name = "contractId", value = "合同段id", required = true)
     })
     public R<List<ArchiveTreeContractVO2>> lazyTree(Long parentId, Long projectId, Long contractId) {
-//		if (projectId == null) {
+//		if (projectId == null) {tree = {ArrayList@17448}  size = 1
 //			projectId = 1578599210897772545L;
 //		}
         List<ArchiveTreeContractVO2> tree = archiveTreeContractService.lazyTree2(AuthUtil.getTenantId(), parentId, projectId, contractId);
@@ -410,4 +410,22 @@ public class ArchiveTreeContractController extends BladeController {
         archiveTreeContractSync.syncBusinessDataThread(projectId,contractId);
         return R.success("开始同步合同段,请耐心等待" );
     }
+
+    @PostMapping("test1")
+    @ApiOperation(value = "同步业务数据", notes = "传入节点id")
+    public R test1(Long projectId,Long contractId) {
+
+        archiveTreeContractSync.syncBusinessData(projectId,contractId);
+
+        return R.success("开始同步合同段,请耐心等待" );
+    }
+
+    @PostMapping("testB")
+    @ApiOperation(value = "同步业务数据", notes = "传入节点id")
+    public R writeBusinessData(Long keyId, Long contractId, String formDataId) {
+
+        archiveTreeContractService.writeBusinessData(keyId,contractId,formDataId);
+
+        return R.success("开始同步合同段,请耐心等待" );
+    }
 }

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

@@ -409,7 +409,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
             String parentId = one.getParentId().toString();
             while (loop < max && StringUtils.isNotEquals(0, parentId)) {
                 WbsTreeContract next = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, one.getContractId()).eq(WbsTreeContract::getId, parentId));
-                if(next.getNodeType().equals(nodeType)){
+                if(next.getNodeType() <= nodeType){
                     return next.getPKeyId();
                 }
                 parentId = next.getParentId().toString();

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

@@ -350,9 +350,7 @@ public class ArTreeContractInitServiceImpl {
 
         for (ArchiveTreeContractVO2 ar : archiveTreeContractVO2s) {
             //关联质检资料
-            if (ar.getAssociationType() != null
-                    && ar.getAssociationType() == 1
-                    && ar.getDisplayHierarchy() != null) {
+            if (ar.IsQualityAssociationNode()) {
                 List<ArchiveTreeContract> tmpList = getTreeContractFromWbs(tenantId, projectId, wbsId, ar);
                 addNodes.addAll(tmpList);
             }

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

@@ -256,6 +256,9 @@ public class ArchiveAutoRuleSyncImpl {
                     ArchiveTreeVO2 proTreeVO2 = proMap.get(fromId);
                     //2.获取项目级groupID
                     Long pro_groupId = proTreeVO2.getArchiveAutoGroupId();
+                    if (pro_groupId == null) {
+                        continue;
+                    }
                     //3.，那么保存到集合  合同段ID_项目级groupID,客户级groupID
                     Long contractId = contractVO2.getContractId();
                     if (contractId != null) {