xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-30 07:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 调整流程作废

Browse Source
This commit is contained in:
songgaoshuai 2023-07-14 13:27:26 +08:00
parent 4554178f1b
commit f0368395d1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
View File

@ -309,10 +309,6 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
} }
//节点图形信息 //节点图形信息
map.put("graphicInfoVos", graphicInfoVos); map.put("graphicInfoVos", graphicInfoVos);
//作废理由
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId)
.processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
map.put("deleteReason", historicProcessInstance.getDeleteReason());
return map; return map;
} }
@ -359,15 +355,18 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
if (CollUtil.isNotEmpty(subTasks)) { if (CollUtil.isNotEmpty(subTasks)) {
subTasks.forEach(e -> taskService.deleteTask(e.getId())); subTasks.forEach(e -> taskService.deleteTask(e.getId()));
} }
String deleteReason = LoginHelper.getUsername() + "作废了当前申请！";
if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) {
deleteReason = LoginHelper.getUsername() + "作废理由:" + processInvalidBo.getDeleteReason();
}
for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason);
}
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceBusinessKey(processInvalidBo.getProcessInstanceId()).processInstanceTenantId(TenantHelper.getTenantId()).singleResult(); .processInstanceBusinessKey(processInvalidBo.getProcessInstanceId()).processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
if (ObjectUtil.isNotEmpty(historicProcessInstance)) { if (ObjectUtil.isNotEmpty(historicProcessInstance)) {
BusinessStatusEnum.checkStatus(historicProcessInstance.getBusinessStatus()); BusinessStatusEnum.checkStatus(historicProcessInstance.getBusinessStatus());
} }
String deleteReason = LoginHelper.getUsername() + "作废了当前申请！";
if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) {
deleteReason = LoginHelper.getUsername() + "作废理由:" + processInvalidBo.getDeleteReason();
}
runtimeService.updateBusinessStatus(processInvalidBo.getProcessInstanceId(), BusinessStatusEnum.INVALID.getStatus()); runtimeService.updateBusinessStatus(processInvalidBo.getProcessInstanceId(), BusinessStatusEnum.INVALID.getStatus());
runtimeService.deleteProcessInstance(processInvalidBo.getProcessInstanceId(), deleteReason); runtimeService.deleteProcessInstance(processInvalidBo.getProcessInstanceId(), deleteReason);
return true; return true;