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

---
 .../ProcessESInitChangeController.java        |  2 +-
 .../service/ProcessEsInitChangeService.java   |  7 +++++++
 .../impl/ProcessEsInitChangeServiceImpl.java  | 19 ++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
index 544222ef..c19dafe8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
@@ -182,7 +182,7 @@ public class ProcessESInitChangeController {
     @ApiOperation(value="企标立项变更流程-转办", notes="企标立项变更流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        initChangeService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
index 89e7d39b..de0bc60e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
@@ -52,4 +52,11 @@ public interface ProcessEsInitChangeService extends IService<ProcessEsInitChange
      * @param standNo
      */
     void autoStartProcessByRecheck(String standardNo);
+
+    /**
+     * 转办
+     * @param taskId
+     * @param userId
+     */
+    void transfer(String taskId, String userId);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 9559970c..6447d7b4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -10,11 +10,8 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
-import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
-import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
 import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
@@ -42,6 +39,8 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant.*;
+
 /**
  * @author ThinkBook
  * @description 针对表【process_es_init_change(企标计划)】的数据库操作Service实现
@@ -201,6 +200,20 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
     }
 
+    @Override
+    public void transfer(String taskId, String toUserId) {
+        // 判断是否是特殊节点，如果是特殊节点则需要替换流程变量
+        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException("taskId为空或任务不存在");
+        }
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String taskName = task.getName();
+        if (taskName.equals(STANDARDIZATION_CHECK)) {
+            taskService.setVariable(taskId, "standardizationApprovalUser", toUserId);
+        }
+        processHandleService.transfer(taskId, toUserId);
+    }
+
     @Override
     public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
         String userId = UserUtils.getUserId();