feat: 年度制修订标准化发起流程保存自翻译

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);
     }
 
     /**