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 e.setProcessInstanceId(processInstanceId)); // 保存到业务流程表 @@ -128,15 +130,21 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl 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 setVariables(InitChangeDataVO initChangeData) { @@ -208,11 +216,23 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl