关联电子文件到归档

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

@@ -124,5 +124,5 @@ public interface ArchiveFileClient {
     List<ArchiveFile> batchSearchArchiveFile(@RequestBody List<Long> ids);
 
     @PostMapping(API_PREFIX + "/addOrUpdateArchiveFileBusinessData")
-    void addOrUpdateArchiveFileBusinessData(@RequestParam Long nodeId, @RequestParam Long keyId, @RequestParam Long contractId, @RequestParam String newFileUrl);
+    void addOrUpdateArchiveFileBusinessData(@RequestParam Long nodeId, @RequestParam Long keyId, @RequestParam Long contractId, @RequestParam String formDataId);
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -261,8 +261,8 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
 
 
     @Override
-    public void addOrUpdateArchiveFileBusinessData(Long nodeId, Long keyId, Long contractId, String newFileUrl) {
-        iTaskService.addOrUpdateArchiveFileBusinessData(nodeId,keyId,contractId,newFileUrl);
+    public void addOrUpdateArchiveFileBusinessData(Long nodeId, Long keyId, Long contractId, String formDataId) {
+        iTaskService.addOrUpdateArchiveFileBusinessData(nodeId,keyId,contractId,formDataId);
     }
 
 }

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

@@ -977,15 +977,21 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         this.archiveFileService.update(wrapper.in(ArchiveFile::getId, Arrays.asList(formDataId.split(","))));
     }
     @Override
-    public void addOrUpdateArchiveFileBusinessData(Long nodeId, Long keyId, Long contractId, String newFileUrl) {
+    public void addOrUpdateArchiveFileBusinessData(Long nodeId, Long keyId, Long contractId, String formDataId) {
+
+        InformationQuery query = this.informationQueryService.getById(formDataId);
+        if (query == null) {
+            return;
+        }
+
         ArchiveFile archiveFile = this.archiveFileService.getOne(Wrappers.<ArchiveFile>lambdaQuery()
                 .eq(ArchiveFile::getNodeId, nodeId.toString())
                 .eq(ArchiveFile::getNodeExtId, keyId)
                 .eq(ArchiveFile::getIsDeleted, 0));
 
         if (archiveFile != null) {
-            archiveFile.setEVisaFile(newFileUrl);
-            archiveFile.setPdfFileUrl(newFileUrl); // 这里将pdfFileUrl也更新了，因为需求中没有限制只能更新eVisaFile属性
+            archiveFile.setEVisaFile(query.getEVisaPdfUrl());
+            archiveFile.setPdfFileUrl(query.getEVisaPdfUrl()); // 这里将pdfFileUrl也更新了，因为需求中没有限制只能更新eVisaFile属性
             this.archiveFileService.updateById(archiveFile);
 
         } else {
@@ -994,10 +1000,20 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             archiveFile.setNodeExtId(keyId);
             archiveFile.setContractId(contractId.toString());
             archiveFile.setStatus(2); // 这里是新增归档文件，所以状态为1（已完成）
-            archiveFile.setEVisaFile(newFileUrl);
-            archiveFile.setPdfFileUrl(newFileUrl);
+            //TODO 文件题名规则，待补充
+            fillFileNameAndTime(archiveFile,query);
+            //
+            archiveFile.setEVisaFile(query.getEVisaPdfUrl());
+            archiveFile.setPdfFileUrl(query.getEVisaPdfUrl());
             this.archiveFileService.save(archiveFile);
         }
     }
 
+    public  void fillFileNameAndTime(ArchiveFile archiveFile,InformationQuery info) {
+        archiveFile.setFileName(info.getName());
+
+        //todo 文件时间怎么取
+        //archiveFile.setFileTime(info.getCreateTime());
+    }
+
 }

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

@@ -974,7 +974,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	}
 
 	/**
-	 * 返回关联质检资料的节点
+	 * 返回某个合同段关联质检资料的节点
 	 * @param contractId
 	 * @return
 	 */
@@ -1049,7 +1049,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	 * @param contractId
 	 * @return
 	 */
-	public Integer writeBusinessData(Long keyId, Long contractId, String newFileUrl) {
+	public Integer writeBusinessData(Long keyId, Long contractId, String formDataId) {
 		// 这里省略了具体实现，可根据业务需求编写相应的逻辑
 
 		List<ArchiveTreeContract> associatedNodes = getWbsAssociatedNodes(contractId.toString());
@@ -1069,7 +1069,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 			ArchiveTreeContract node = getWbsNodeFromWbsKeyId(contractId,keyId,attachId);
 			if (node!= null ) {
 
-				archiveFileClient.addOrUpdateArchiveFileBusinessData(node.getId(),keyId,contractId,newFileUrl);
+				archiveFileClient.addOrUpdateArchiveFileBusinessData(node.getId(),keyId,contractId,formDataId);
 			}
 		}
 
@@ -1083,5 +1083,15 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		}
 	}
 
+	void BusinessData(Long contractId) {
+
+		//获取该合同段完成电签的文件题名，主要是获取pkid和fileurl
+
+		//获取返回某个合同段关联质检资料的节点
+
+	}
+
+
+
 
 }