任务审批缓存

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -391,16 +391,6 @@ public class TaskController extends BladeController {
                     }
                 }
             }
-
-            //更新redis缓存
-            if (formDataId.length > 0) {
-                List<InformationQuery> dataList = informationQueryService.getBaseMapper().selectBatchIds(Arrays.asList(formDataId));
-                List<Long> contractIds = dataList.stream().map(InformationQuery::getContractId).distinct().collect(Collectors.toList());
-                for (Long contractId : contractIds) {
-                    informationQueryService.delAsyncWbsTree(contractId + "");
-                }
-            }
-
             return R.data(true);
         }
         return R.data(false);

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

@@ -610,7 +610,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     RedisTemplate.opsForValue().set("sign-" + taskApprovalVO.getFormDataId(), "1", 66, TimeUnit.SECONDS);
                     CompletableFuture<Void> runAsync = CompletableFuture.runAsync(() -> {
                         try {
+
+                            /*===============执行批量任务===============*/
                             this.checkIsExsitTaskBatch(taskApprovalVO, taskBatchId, userId, nickName);
+
                         } catch (FileNotFoundException e) {
                             e.printStackTrace();
                         }
@@ -631,23 +634,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         taskApprovalVO.setUserId(userId);
         taskApprovalVO.setNickName(nickName);
 
+        /*===============执行审批===============*/
         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)) {
-            //已审批
-            this.iTrialSelfInspectionRecordService.updateTrialSelfInspectionRecordStatus(pdfUrlEVisa, taskApprovalVO);
-            //executor删除掉对应批次
-            this.taskBatchService.deletedById(batchId);
-        }
 
-        if (!"OK".equals(taskApprovalVO.getFlag())) {
-            //已废除
-            this.iTrialSelfInspectionRecordService.updateTrialSelfInspectionRecordStatusFC(taskApprovalVO);
-            //executor删除掉对应批次
-            this.taskBatchService.deletedById(batchId);
-        }
+        /*===============试验自检任务相关===============*/
+        this.trialSelfTaskRelated(taskApprovalVO, pdfUrlEVisa, batchId);
+
         RedisTemplate.delete("sign-" + taskApprovalVO.getFormDataId());
     }
 
@@ -684,6 +678,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         .set(TaskBatch::getIsDeleted, 4)
                         .eq(TaskBatch::getId, taskApprovalVO.getId())
                 );
+
             } else if ("success".equals(eVisaStatus) || eVisaStatus.contains("success")) {
                 //审批通过会返回签章成功的文件，需要设置替换
                 //完成/审批当前分支流程
@@ -833,7 +828,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     /**
      * 任务废除通知
      */
-    private void abolishMessage(Task masterTask, TaskParallel currentLink, String comment,String nickName) {
+    private void abolishMessage(Task masterTask, TaskParallel currentLink, String comment, String nickName) {
         //查询合同段及项目名称
         ProjectInfo projectInfo = this.projectClient.queryProjectList(Func.toStrList(masterTask.getProjectId())).get(0);
         String projectName = StringUtils.isNotEmpty(projectInfo.getProjectAlias()) ? projectInfo.getProjectAlias() : projectInfo.getProjectName();
@@ -929,6 +924,26 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         }
     }
 
+    /**
+     * 试验自检任务业务相关
+     */
+    private void trialSelfTaskRelated(TaskApprovalVO taskApprovalVO, String pdfUrlEVisa, String batchId) throws FileNotFoundException {
+        //============== 电签成功，修改试验状态，关联工程部位信息pdf（只有电签成功，才修改） ==============
+        if ("OK".equals(taskApprovalVO.getFlag()) && StringUtils.isNotEmpty(pdfUrlEVisa)) {
+            //已审批
+            this.iTrialSelfInspectionRecordService.updateTrialSelfInspectionRecordStatus(pdfUrlEVisa, taskApprovalVO);
+            //executor删除掉对应批次
+            this.taskBatchService.deletedById(batchId);
+        }
+
+        if (!"OK".equals(taskApprovalVO.getFlag())) {
+            //已废除
+            this.iTrialSelfInspectionRecordService.updateTrialSelfInspectionRecordStatusFC(taskApprovalVO);
+            //executor删除掉对应批次
+            this.taskBatchService.deletedById(batchId);
+        }
+    }
+
     @Override
     public Boolean startApproval(TaskVO vo) {
         //获取业务表
@@ -1157,10 +1172,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         .set(InformationQuery::getBusinessTime, dateInfo)
                         .in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
 
-                //如果是废除任务，那么删除合同段节点树缓存
+                /*//如果是废除任务，那么删除合同段节点树缓存
                 if (status == 3) {
                     informationQueryService.delAsyncWbsTree(queryinfo.getContractId().toString());
-                }
+                }*/
 
                 //修改试验业务状态（已审批的情况下修改）
                 if (new Integer(2).equals(queryinfo.getType()) && ObjectUtil.isNotEmpty(queryinfo.getWbsId()) && status != 3) {