update 强制撤回

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

@@ -67,25 +67,25 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
     }
 
     public void forcedWithdrawal(String processInstanceId) {
-        //activiti撤销
-        runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
         //获得流程总表
         ProcessAll processAll = getByProcessInstanceId(processInstanceId);
+        //业务表修改为草稿
+        Integer prcType = processAll.getPrcType();
+        WorkCenterService classByValue = null;
+        try {
+            classByValue = (WorkCenterService) Class.forName(ProcessTypeEnum.getClassByValue(prcType)).newInstance();
+            classByValue.changeToDraft(processAll);
+        }catch (Exception e) {
+            log.error(e.getMessage(),e);
+        }
+        //activiti撤销
+        runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
         //删除流程总表
         this.removeById(processAll.getId());
         //删除审批表
         LambdaQueryWrapper<ProcessApprovalRecord> wrapper1 = new LambdaQueryWrapper<>();
         wrapper1.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
         approvalRecordService.remove(wrapper1);
-        //业务表修改为草稿
-        Integer prcType = processAll.getPrcType();
-        WorkCenterService classByValue = null;
-        try {
-            classByValue = (WorkCenterService) Class.forName(ProcessTypeEnum.getClassByValue(prcType)).newInstance();
-            classByValue.changeToDraft(processAll.getProjectId());
-        }catch (Exception e) {
-            log.error(e.getMessage(),e);
-        }
         //todo 同步删除操作到统一待办
     }
 

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

@@ -1,5 +1,7 @@
 package com.jero.modules.activiti.service;
 
+import com.jero.modules.activiti.entity.ProcessAll;
+
 /**
  * @author liJiaRao
  * @date 2023-10-19 15:22
@@ -7,7 +9,7 @@ package com.jero.modules.activiti.service;
 public interface WorkCenterService {
     /**
      * 更改业务表为草稿
-     * @param id
+     * @param processAll 流程总表
      */
-    void changeToDraft(String id);
+    void changeToDraft(ProcessAll processAll);
 }