From bfd4107ba9333efd75a8b619c8538e7acc53f8ac Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 25 Jan 2024 17:46:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=9D=E5=AD=98=E8=87=AA=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index c14e1e04..6a4a0480 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.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.CommonAPI;
+import com.jero.common.aspect.TranslationAspect;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.SysDictItemCore;
@@ -94,6 +95,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
     @Resource
     private IProcessHandleService processHandleService;
 
+    @Resource
+    private TranslationAspect translationAspect;
 
     @Override
     public void startProcess(AnnualInitDataVO annualInitData) {
@@ -116,10 +119,17 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String processInstanceId = processInstance.getId();
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
-        // 自动完成第一个任务
-        actFlowCommonService.autoCompleteFirstTask(userId, processInstanceId, processDefinitionId, commonVO);
         // 保存选人信息
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
+        // 获取第一个任务的taskId
+        String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
+        // 手动翻译
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(actVariables));
+        // 强制撤回
+        commonVO.setProcessInstanceId(processInstanceId);
+        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT, jsonData);
+        // 自动完成第一个任务
+        actFlowCommonService.completeTask(taskId, userId);
         // 保存数据
         dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
         dataList.forEach(ProcessEsAnnualInit::setDateEditFlag);
@@ -130,9 +140,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         Date dueTime = commonVO.getDueTime();
         Integer prcType = ProcessTypeEnum.ES_ANNUAL_INIT.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
-        // 强制撤回
-        commonVO.setProcessInstanceId(processInstanceId);
-        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT, annualInitData);
     }
 
     /**