fix(稽查流程): 强制撤销

laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java

@@ -170,6 +170,9 @@ public class WorkCenterController {
         String processInstanceId = map.get("processInstanceId");
 
         processAllService.forcedWithdrawal(processInstanceId);
+
+        String projectId = map.get("projectId");
+        processAllService.updateDraftStatusByProjectId(projectId);
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java

@@ -196,7 +196,7 @@ public class ProcessAspect {
         log.info("==========流程驳回，若驳回到的节点之前经过转办，则驳回到转办人手里后置方法结束==========");
     }
 
-    @AfterReturning("processServiceFlowSave() || processServiceFlowStart()|| processServiceFlowStart()|| processServiceFlowStart()")
+    @AfterReturning("processServiceFlowSave() || processServiceFlowStart()")
     public void doAfterFlowSave(JoinPoint jp) {
         log.info("==========流程保存到草稿后置方法开始==========");
         if (!Objects.isNull(jp.getArgs())) {

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java

@@ -132,7 +132,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
                 .processInstanceId(processInstance.getId())
                 .singleResult();
 
-        // 更新流程审批信息
+        // 更新流程审批信息、
         processApprovalRecord.setUserId(loginUser.getId());
         processApprovalRecord.setProjectId(processAll.getProjectId());
         processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java

@@ -60,6 +60,14 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
     @Resource
     private ProcessDraftService processDraftService;
 
+    private static final List<Integer> INSPECT_PROCESS = Arrays.asList(
+            ProcessTypeEnum.ES_INSPECT_PLAN.getValue(),
+            ProcessTypeEnum.ES_INSPECT.getValue(),
+            ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue(),
+            ProcessTypeEnum.ES_INSPECT_REPORT.getValue(),
+            ProcessTypeEnum.PERMISSION_APPLY_PROCESS.getValue(),
+            ProcessTypeEnum.STANDARD_DECLARE.getValue(),
+            ProcessTypeEnum.MEETING_MANAGE.getValue());
     public ProcessAll getByProcessInstanceId(String processInstanceId){
         LambdaQueryWrapper<ProcessAll> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessAll::getProcessInstanceId,processInstanceId);
@@ -228,4 +236,18 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         sendMessageAPI.sendMessage(sendMessageDTO);
 
     }
+
+    public void updateDraftStatusByProjectId(String projectId) {
+        if (StringUtils.isNotBlank(projectId)){
+            List<ProcessDraft> list = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>().eq(ProcessDraft::getProjectId, projectId));
+            if (!list.isEmpty()){
+                List<Integer> prcTypeList = list.stream().map(ProcessDraft::getPrcType).collect(Collectors.toList());
+                if (INSPECT_PROCESS.contains(prcTypeList.get(0))){
+                    processDraftService.update(new LambdaUpdateWrapper<ProcessDraft>()
+                            .eq(ProcessDraft::getProjectId, projectId)
+                            .set(ProcessDraft::getSaveSource, null));
+                }
+            }
+        }
+    }
 }