From a75b7e511ca895c1e122b51e326647e084c3988c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 25 Jan 2024 17:43:53 +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=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=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/ProcessEsAnnualReportServiceImpl.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 7eac21e2..d1402d9c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
@@ -87,6 +88,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     @Resource
     private IProcessHandleService processHandleService;
 
+    @Resource
+    private TranslationAspect translationAspect;
+
     @Override
     public void startProcess(AnnualReportDataVO annualReportData) {
         // 流程Key
@@ -108,10 +112,17 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         String processInstanceId = processInstance.getId();
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
-        // 自动完成第一个任务
-        actFlowCommonService.autoCompleteFirstTask(userId, processInstanceId, processDefinitionId, commonVO);
         // 保存选人信息
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
+        // 获取第一个任务的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_ANNUAL_REPORT, jsonData);
+        // 自动完成第一个任务
+        actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
         String prcName = commonVO.getPrcName();
         String prcMes = commonVO.getPrcMes();
@@ -120,9 +131,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
         // 执行流程发起前的操作
         this.startRunTask(annualReportData);
-        // 强制撤回
-        commonVO.setProcessInstanceId(processInstanceId);
-        actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT, annualReportData);
     }
 
     public Map<String, Object> setVariables(AnnualReportDataVO annualReportData) {