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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2024-08-08 18:29:55 +08:00
parent b29411e0b6 e942bb8f27
commit c9d613a5c8
1 changed files with 16 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
+16 -5
View File
@@ -252,6 +252,13 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
processDraftUpdateWrapper.set(ProcessDraft::getTaskId, null);
processDraftService.update(processDraftUpdateWrapper);
}
//查询所有待办任务
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue());
List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
//activiti撤销
runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
//更新流程总表状态
@@ -268,11 +275,6 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
processApprovalRecord.setCreateTime(null);
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<>();
String processDefinitionId = processAll.getProcessDefinitionId();
@@ -284,6 +286,15 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
todoAddList.add(unifiedTodoVO);
}
pushWorkflowIntegrationAPI.sendTodoTask(todoAddList);
// 撤回后修改状态为未处理
for (ProcessApprovalRecord approvalRecord : approvalRecordList) {
LambdaUpdateWrapper<ProcessApprovalRecord> updateProcessApprovalRecord = new LambdaUpdateWrapper<>();
updateProcessApprovalRecord.eq(ProcessApprovalRecord::getId,approvalRecord.getId());
updateProcessApprovalRecord.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.SUSPEND.getValue());
approvalRecordService.update(updateProcessApprovalRecord);
}
}
public void delegateTaskA(DelegateTaskParam param) {