任务废除缓存

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

@@ -630,7 +630,6 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
         String pdfUrlEVisa = this.completeApprovalTask(taskApprovalVO);
 
-
         System.out.println("电签操作成功buss-----" + pdfUrlEVisa + "---batchId=" + batchId);
         //TODO ============== 电签成功，修改试验状态，关联工程部位信息pdf（只有电签成功，才修改） liuYc 2023-03-16 ==============
         if ("OK".equals(taskApprovalVO.getFlag()) && StringUtils.isNotEmpty(pdfUrlEVisa)) {
@@ -805,6 +804,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
             //任务废除通知
             this.abolishMessage(masterTask, currentLink, comment);
+
+            //删除合同段树redis缓存 TODO 不清楚updateBusinessDataByFormDataId为什么没生效，在外层再次删除
+            informationQueryService.delAsyncWbsTree(masterTask.getContractId());
         }
         return "";
     }
@@ -1136,7 +1138,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         .set(InformationQuery::getBusinessTime, dateInfo)
                         .in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
 
-                //如果是废除任务，那么删除合同段节点树缓存
+                //如果是废除任务，那么删除合同段节点树缓存 TODO 不清楚为什么没生效，在外层删除
                 if (status == 3) {
                     informationQueryService.delAsyncWbsTree(queryinfo.getContractId().toString());
                 }
@@ -1237,12 +1239,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             if (wbsTreeContract != null) {
                 createTime = wbsTreeContract.getCreateTime();
             }
-            ArchiveFile newArchiveFile = getArchiveFile(query, nodeId, keyId, query.getEVisaPdfSize(), contractIndfo.archivesUnit(), createTime,query.getClassify());
+            ArchiveFile newArchiveFile = getArchiveFile(query, nodeId, keyId, query.getEVisaPdfSize(), contractIndfo.archivesUnit(), createTime, query.getClassify());
             this.archiveFileService.save(newArchiveFile);
         }
     }
 
-    public ArchiveFile getArchiveFile(InformationQuery query, Long nodeId, Long keyId, Long fileSize, String unit, Date createTime,Integer classify) {
+    public ArchiveFile getArchiveFile(InformationQuery query, Long nodeId, Long keyId, Long fileSize, String unit, Date createTime, Integer classify) {
         ArchiveFile archiveFile = new ArchiveFile();
         archiveFile.setNodeId(nodeId.toString());
         archiveFile.setNodeExtId(keyId);
@@ -1372,7 +1374,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 //    }
 
     @Override
-    public void reSigningEVisa(String taskIds, String contractId, String projectId,String header) {
+    public void reSigningEVisa(String taskIds, String contractId, String projectId, String header) {
         //查询任务信息
         List<Task> taskList = jdbcTemplate.query("select * from u_task where id in(" + taskIds + ")", new BeanPropertyRowMapper<>(Task.class));
         if (taskList.size() > 0) {
@@ -1388,7 +1390,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
             //获取每条任务对应的节点信息
             List<String> dataIdList = taskList.stream().map(Task::getFormDataId).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
-            Map<String, String> queryMap = jdbcTemplate.query("select * from u_information_query where id in(" + StringUtils.join(dataIdList, ",") + ")", new BeanPropertyRowMapper<>(InformationQuery.class)).stream().collect(Collectors.toMap(l -> l.getId()+"", l -> l.getWbsId()+""));
+            Map<String, String> queryMap = jdbcTemplate.query("select * from u_information_query where id in(" + StringUtils.join(dataIdList, ",") + ")", new BeanPropertyRowMapper<>(InformationQuery.class)).stream().collect(Collectors.toMap(l -> l.getId() + "", l -> l.getWbsId() + ""));
             try {
                 for (Task task : taskList) {
                     //重新保存
@@ -1427,7 +1429,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         this.taskParallelService.update(Wrappers.<TaskParallel>lambdaUpdate()
                                 .set(TaskParallel::getEVisaContent, "重新保存PDF失败")
                                 .eq(TaskParallel::getProcessInstanceId, task.getProcessInstanceId())
-                                .eq(TaskParallel::getEVisaStatus,"99"));
+                                .eq(TaskParallel::getEVisaStatus, "99"));
                     }
                 }
 
@@ -1440,8 +1442,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         throw new ServiceException("未获取到任务信息，操作失败！");
     }
 
-    R saveNodePdf(String nodePKeyIds, String contractId, String projectId,String header) throws Exception {
-        return excelTabClient.synPDFInfo(contractId, nodePKeyIds, "1", projectId,header);
+    R saveNodePdf(String nodePKeyIds, String contractId, String projectId, String header) throws Exception {
+        return excelTabClient.synPDFInfo(contractId, nodePKeyIds, "1", projectId, header);
     }
 
 }