From e0173068452e603224dc7266e586e43019067389 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 10 Jan 2024 14:42:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E=E9=A9=B3=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ESRevisionController.java      |  2 +-
 .../esRevision/service/EsRevisionService.java | 21 +++++------
 .../service/impl/EsRevisionServiceImpl.java   | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
index fd4d3528..8ef8f2be 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
@@ -127,7 +127,7 @@ public class ESRevisionController {
     @ApiOperation(value="企标制修订流程-转办", notes="企标制修订流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        revisionService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/EsRevisionService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/EsRevisionService.java
index affd3789..5f20c259 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/EsRevisionService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/EsRevisionService.java
@@ -1,26 +1,27 @@
 package com.jero.modules.activiti.process.esRevision.service;
 
-import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 
 /**
-* @author ThinkBook
-* @description 针对表【process_es_revision】的数据库操作Service
-* @createDate 2023-12-19 11:58:59
-*/
+ * @author ThinkBook
+ * @description 针对表【process_es_revision】的数据库操作Service
+ * @createDate 2023-12-19 11:58:59
+ */
 public interface EsRevisionService extends IService<ProcessEsRevision> {
 
 
-     ESRevisionDataVO getHandleData(String taskId);
+    ESRevisionDataVO getHandleData(String taskId);
 
-     void autoStartProcess(ESRevisionDataVO revisionData);
+    void autoStartProcess(ESRevisionDataVO revisionData);
 
-     void saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO);
+    void saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO);
 
-     void startProcess(ESRevisionDataVO revisionData);
+    void startProcess(ESRevisionDataVO revisionData);
 
-     void approval(ESRevisionDataVO revisionData, boolean pass);
+    void approval(ESRevisionDataVO revisionData, boolean pass);
+
+    void transfer(String taskId, String userId);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 4cc056e9..01a8d0fd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -540,6 +540,41 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         actFlowCommonService.completeTask(taskId, userId);
     }
 
+    @Override
+    public void transfer(String taskId, String toUserId) {
+        // 判断是否是特殊节点，如果是特殊节点则需要替换流程变量
+        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException("taskId为空或任务不存在");
+        }
+        if (StrUtil.isBlank(toUserId)) {
+            throw new JeroBootException("转办人不能为空");
+        }
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        // 获取执行id
+        String executionId = task.getExecutionId();
+        // 获取当前节点的id
+        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
+        String xmlNodeId = record.getNodeId();
+        switch (xmlNodeId) {
+            case MAIN_DRAFT_USER_COLLECT_FIRST:
+                taskService.setVariable(taskId, "mainDraftUser", toUserId);
+                break;
+            case STANDARDIZATION_CHECK:
+                taskService.setVariable(taskId, "standardizationUser", toUserId);
+                break;
+            case CONTACT_USER_DISTRIBUTE:
+            case CONTACT_USER_COLLECT:
+                runtimeService.setVariable(executionId, "contactUser", toUserId);
+                runtimeService.setVariable(executionId, toUserId + "-ExecutionId", executionId);
+                break;
+            case CONTACT_USER_LEADER_APPROVAL:
+                runtimeService.setVariable(executionId, "contactUserLeader", toUserId);
+                runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", toUserId);
+                break;
+        }
+        processHandleService.transfer(taskId, toUserId);
+    }
+
     @Override
     public void saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO) {
         ESRevisionDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();