QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mzaxd
2024-10-08 11:20:15 +08:00
parent d9694f1e72
commit ca05394a9e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+5 -3
View File
@@ -268,18 +268,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
if (!adviceList.isEmpty()) { if (!adviceList.isEmpty()) {
adviceList.forEach(advice -> { adviceList.forEach(advice -> {
advice.setProcessInstanceId(processInstanceId); advice.setProcessInstanceId(processInstanceId);
advice.setBatchNum(maxBatchNum); advice.setBatchNum(maxBatchNum + 1);
advice.setCreateUserId(curUserId); advice.setCreateUserId(curUserId);
}); });
adviceList.forEach(advice -> advice.setBatchNum(maxBatchNum));
adviceService.saveBatch(adviceList); adviceService.saveBatch(adviceList);
} }
break;
case ADVICE_COLLECT: case ADVICE_COLLECT:
// 保存数据 // 保存数据
adviceService.updateBatchById(adviceList); adviceService.updateBatchById(adviceList);
// 给主起草人发消息 // 给主起草人发消息
String mainDraftUser = (String) taskService.getVariable(taskId, MAIN_DRAFT_USER); String mainDraftUser = (String) taskService.getVariable(taskId, MAIN_DRAFT_USER);
this.sendMessageToMainDraftUser(mainDraftUser, processInstanceId, maxBatchNum); this.sendMessageToMainDraftUser(mainDraftUser, processInstanceId, maxBatchNum);
break;
case SET_STANDARD_NUMBER: case SET_STANDARD_NUMBER:
// 判断标准编号是否重复 // 判断标准编号是否重复
Map<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class); Map<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class);
@@ -313,6 +314,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
} }
// 保存数据 // 保存数据
updateById(data); updateById(data);
break;
} }
// 审批节点 // 审批节点
actFlowCommonService.completeTask(taskId, curUserId); actFlowCommonService.completeTask(taskId, curUserId);
@@ -325,7 +327,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
} }
private Integer calculateAdviceBatchNum(List<EsRevisionAdvice> adviceList) { 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) { private void sendMessageToMainDraftUser(String mainDraftUser, String processInstanceId, Integer maxBatchNum) {