From 2385ab7b1c41a5ca4c5bbba8af32003538bb8a40 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 25 Jan 2024 17:34:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98=E8=87=AA?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsInitChangeServiceImpl.java  | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

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 82c7b73e..ade2037a 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.aspect.TranslationAspect;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
@@ -93,6 +94,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Resource
     private EnterpriseStandardPlanService espService;
 
+    @Resource
+    private TranslationAspect translationAspect;
+
     @Override
     public void startProcess(InitChangeDataVO initChangeData) {
         // 发起的时候校验标准编号是是否重复
@@ -118,8 +122,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         String processInstanceId = processInstance.getId();
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, variables);
-        // 自动完成第一个任务
-        actFlowCommonService.autoCompleteFirstTask(userId, processInstanceId, processDefinitionId, commonVO);
         // 设置流程实例Id
         esInitChangeList.forEach(e -> e.setProcessInstanceId(processInstanceId));
         // 保存到业务流程表
@@ -128,15 +130,21 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 人员
         Map<String, Object> flowUserInfoVO = initChangeData.getFlowUserInfoVO();
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, flowUserInfoVO);
+        // 获取第一个任务的taskId
+        String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
+        // 手动翻译
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
+        // 强制撤回
+        commonVO.setProcessInstanceId(processInstanceId);
+        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
+        // 自动完成第一个任务
+        actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
         String prcName = commonVO.getPrcName();
         String prcMes = commonVO.getPrcMes();
         Date dueTime = commonVO.getDueTime();
         Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
-        // 强制撤回
-        commonVO.setProcessInstanceId(processInstanceId);
-        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, initChangeData);
     }
 
     public Map<String, Object> setVariables(InitChangeDataVO initChangeData) {
@@ -208,11 +216,23 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         this.setInitChangeData(standardNo, initChange, processInstanceId);
         // 保存到业务流程表
         save(initChange);
+        // 流程名
+        String prcName = standardNo + "--立项";
         // 保存选人信息
         // 人员
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, variables);
+        // 获取第一个任务的taskId
+        String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
+        // 手动翻译
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
+        // 强制撤回
+        CommonVO commonVO = new CommonVO();
+        commonVO.setPrcName(prcName);
+        commonVO.setPrcMes(null);
+        commonVO.setDueTime(null);
+        commonVO.setProcessInstanceId(processInstanceId);
+        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
         // 根据流程实例id更新流程总表
-        String prcName = standardNo + "--立项";
         Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
     }