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

fix:88255

Browse Source
This commit is contained in:
梁琦涛
2024-08-09 09:51:37 +08:00
parent 090984988f
commit f5ffceceb6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+10 -5
View File
@@ -254,10 +254,10 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
} }
//查询所有待办任务 //查询所有待办任务
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessApprovalRecord> wrapperOld = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); wrapperOld.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue()); wrapperOld.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper); List<ProcessApprovalRecord> approvalRecordListOld = approvalRecordService.list(wrapperOld);
//activiti撤销 //activiti撤销
runtimeService.deleteProcessInstance(processInstanceId,"强制撤回"); runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
@@ -275,6 +275,11 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
processApprovalRecord.setCreateTime(null); processApprovalRecord.setCreateTime(null);
approvalRecordService.save(processApprovalRecord); approvalRecordService.save(processApprovalRecord);
//查询所有待办任务
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
//同步删除操作到统一待办 //同步删除操作到统一待办
List<UnifiedTodoVO> todoAddList = new ArrayList<>(); List<UnifiedTodoVO> todoAddList = new ArrayList<>();
String processDefinitionId = processAll.getProcessDefinitionId(); String processDefinitionId = processAll.getProcessDefinitionId();
@@ -288,7 +293,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
pushWorkflowIntegrationAPI.sendTodoTask(todoAddList); pushWorkflowIntegrationAPI.sendTodoTask(todoAddList);
// 撤回后修改状态为未处理 // 撤回后修改状态为未处理
for (ProcessApprovalRecord approvalRecord : approvalRecordList) { for (ProcessApprovalRecord approvalRecord : approvalRecordListOld) {
LambdaUpdateWrapper<ProcessApprovalRecord> updateProcessApprovalRecord = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ProcessApprovalRecord> updateProcessApprovalRecord = new LambdaUpdateWrapper<>();
updateProcessApprovalRecord.eq(ProcessApprovalRecord::getId,approvalRecord.getId()); updateProcessApprovalRecord.eq(ProcessApprovalRecord::getId,approvalRecord.getId());
updateProcessApprovalRecord.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.SUSPEND.getValue()); updateProcessApprovalRecord.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.SUSPEND.getValue());