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 6a4a0480..4c41145f 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 @@ -117,6 +117,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setProcessInstanceId(processInstanceId)); + dataList.forEach(ProcessEsAnnualInit::setDateEditFlag); + saveBatch(dataList); // 手动设置所有流程变量 actFlowCommonService.setProcessVariables(processInstanceId, actVariables); // 保存选人信息 @@ -124,16 +128,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setProcessInstanceId(processInstanceId)); - dataList.forEach(ProcessEsAnnualInit::setDateEditFlag); - saveBatch(dataList); // 根据流程实例id更新流程总表 String prcName = commonVO.getPrcName(); String prcMes = commonVO.getPrcMes(); 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 d1402d9c..fd0425a7 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 @@ -117,7 +117,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl