fix: 企标部分流程发起保存草稿报错

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -117,6 +117,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 获取流程实例ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
         String processInstanceId = processInstance.getId();
+        // 保存数据
+        dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
+        dataList.forEach(ProcessEsAnnualInit::setDateEditFlag);
+        saveBatch(dataList);
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
         // 保存选人信息
@@ -124,16 +128,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(actVariables));
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), 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);
-        saveBatch(dataList);
         // 根据流程实例id更新流程总表
         String prcName = commonVO.getPrcName();
         String prcMes = commonVO.getPrcMes();

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -117,7 +117,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), variables);
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT, jsonData);

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -133,7 +133,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), flowUserInfoVO);
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -108,6 +108,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 获取流程实例ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
         String processInstanceId = processInstance.getId();
+        // 保存数据
+        data.setProcessInstanceId(processInstanceId);
+        data.setOtherDrafterUploadFileJson(data.getOtherDraftUserVOS());
+        save(data);
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
         // 保存选人信息
@@ -115,16 +119,12 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(actVariables));
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), actVariables);
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
-        // 保存数据
-        data.setProcessInstanceId(processInstanceId);
-        data.setOtherDrafterUploadFileJson(data.getOtherDraftUserVOS());
-        save(data);
         // 根据流程实例id更新流程总表
         String prcName = commonVO.getPrcName();
         String prcMes = commonVO.getPrcMes();