fix: 征求意见轮数一直为1

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

@@ -268,18 +268,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 if (!adviceList.isEmpty()) {
                     adviceList.forEach(advice -> {
                         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<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class);
@@ -313,6 +314,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 }
                 // 保存数据
                 updateById(data);
+                break;
         }
         // 审批节点
         actFlowCommonService.completeTask(taskId, curUserId);
@@ -325,7 +327,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     }
 
     private Integer calculateAdviceBatchNum(List<EsRevisionAdvice> 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) {