From fdee5717d25da77edbd448d135f5ddbd5d126131 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Mon, 6 Nov 2023 15:24:09 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=5F=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E8=BD=AC=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessFbEntryChangeController.java           |  9 +++++++++
 .../fb/service/IProcessFbEntryChangeService.java  |  7 +++++++
 .../process/fb/service/IProcessHandleService.java |  7 +++++++
 .../impl/ProcessFbEntryChangeServiceImpl.java     | 10 ++++++++++
 .../fb/service/impl/ProcessHandleServiceImpl.java | 15 +++++++++++++++
 5 files changed, 48 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java
index d6049916..22cd41a7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.fb.controller;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.util.MessageUtils;
+import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange;
 import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
@@ -83,6 +84,14 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
 		 return Result.OK();
 	 }
 
+	 @AutoLog(value = "标准法规入库_变更流程-转办")
+	 @ApiOperation(value="标准法规入库_变更流程-转办", notes="标准法规入库_变更流程-转办")
+	 @PostMapping(value = "/transfer")
+	 public Result<T> transfer(@RequestBody TransferVO transferVO) {
+		 processFbEntryChangeService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+		 return Result.OK();
+	 }
+
 	 @AutoLog(value = "流程处理-保存为草稿")
 	 @ApiOperation(value = "流程处理-保存为草稿", notes = "流程处理-保存为草稿")
 	 @PostMapping(value = "/saveToDraft")
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java
index a27f4921..c7645445 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java
@@ -47,6 +47,13 @@ public interface IProcessFbEntryChangeService extends IService<ProcessFbEntryCha
      **/
     void approveTask(ProcessInfoVO processInfoVO, boolean pass);
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/6 15:22
+     * @Description: 转办
+     **/
+    void transfer(String taskId, String toUserId);
+
     /**
      * @Author: liao
      * @Date: 2023/11/3 10:58
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java
index 177f1419..d1d8aa5a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java
@@ -23,6 +23,13 @@ public interface IProcessHandleService {
      **/
     void approveTask(ProcessInfoVO processInfoVO, boolean pass);
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/6 15:16
+     * @Description: 转办
+     **/
+    void transfer(String taskId, String toUserId);
+
     /**
      * @Author: liao
      * @Date: 2023/11/6 11:59
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 826d4869..a1ea99d2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -114,6 +114,16 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         processHandleService.approveTask(processInfoVO, pass);
     }
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/6 15:23
+     * @Description: 转办
+     **/
+    @Override
+    public void transfer(String taskId, String toUserId) {
+        processHandleService.transfer(taskId, toUserId);
+    }
+
     /**
      * @Author: liao
      * @Date: 2023/11/3 11:28
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
index 1d69af1e..75a283c7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
@@ -122,6 +122,21 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         taskService.complete(taskId);
     }
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/6 15:17
+     * @Description: 转办
+     **/
+    @Override
+    public void transfer(String taskId, String toUserId) {
+        isMyTask(taskId); // 判断是否拥有任务处理权限
+        ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
+        processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人
+        processApprovalRecord.setUserId(toUserId); // 任务处理人
+        processApprovalRecordService.updateById(processApprovalRecord);
+        taskService.setAssignee(taskId, toUserId);
+    }
+
     /**
      * @Author: liao
      * @Date: 2023/11/6 12:00