diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java index 58c6b94c..cad2d4b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java @@ -268,18 +268,19 @@ public class EsRevisionServiceImpl extends ServiceImpl { advice.setProcessInstanceId(processInstanceId); - advice.setBatchNum(maxBatchNum); + advice.setBatchNum(maxBatchNum + 1); advice.setCreateUserId(curUserId); }); - adviceList.forEach(advice -> advice.setBatchNum(maxBatchNum)); adviceService.saveBatch(adviceList); } + break; case ADVICE_COLLECT: // 保存数据 adviceService.updateBatchById(adviceList); // 给主起草人发消息 String mainDraftUser = (String) taskService.getVariable(taskId, MAIN_DRAFT_USER); this.sendMessageToMainDraftUser(mainDraftUser, processInstanceId, maxBatchNum); + break; case SET_STANDARD_NUMBER: // 判断标准编号是否重复 Map variables = JSON.parseObject(data.getBusinessJson(), Map.class); @@ -313,6 +314,7 @@ public class EsRevisionServiceImpl extends ServiceImpl adviceList) { - return adviceList.stream().mapToInt(EsRevisionAdvice::getBatchNum).max().orElse(1); + return adviceList.stream().mapToInt(EsRevisionAdvice::getBatchNum).max().orElse(0); } private void sendMessageToMainDraftUser(String mainDraftUser, String processInstanceId, Integer maxBatchNum) {