From 6a0f7f4c641621f0fa05452c7d2e0914fbfec6f2 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Dec 2023 09:33:40 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=80=9A=E7=94=A8=E8=BD=AC=E5=8A=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/controller/WorkCenterController.java   | 11 +++++++----
 .../modules/activiti/service/ProcessAllService.java | 13 -------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
index 4304e7e0..8d42e061 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
@@ -10,6 +10,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.vo.DelegateTaskParam;
@@ -44,6 +45,8 @@ public class WorkCenterController {
     private ProcessDraftService processDraftService;
     @Resource
     private ProcessApprovalRecordService processApprovalRecordService;
+    @Resource
+    private IProcessHandleService processHandleService;
 
     @ApiOperation(value = "查询待办流程列表")
     @GetMapping("/getTodoList")
@@ -178,12 +181,12 @@ public class WorkCenterController {
     }
 
     /**
-     * 转签
+     * 转办
      */
-    @ApiOperation(value="转签")
-    @PostMapping("/transferTask")
+    @ApiOperation(value="转办")
+    @PostMapping("/transfer")
     public Result<Object> transferTask(@RequestBody DelegateTaskParam param) {
-        processAllService.transferTask(param);
+        processHandleService.transfer(param.getTaskId(), param.getUserId());
         return Result.OK();
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index 23da04ef..4a862e47 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -154,17 +154,4 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         approvalRecordService.update(updateWrapper1);
     }
 
-    public void transferTask(DelegateTaskParam param) {
-     String taskId = param.getTaskId();
-     String userId = param.getUserId();
-        //获取审批（未完成的任务id是之前的）
-        ProcessApprovalRecord approvalRecord = approvalRecordService.getToDoByTaskId(taskId);
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(ProcessApprovalRecord::getId, approvalRecord.getId());
-        updateWrapper.set(ProcessApprovalRecord::getTransferBy,loginUser.getId());
-        updateWrapper.set(ProcessApprovalRecord::getUserId,userId);
-        approvalRecordService.update(updateWrapper);
-    }
 }