From fe13fd899c03199dd3ba5523d54f7fbd710fb295 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 09 三月 2024 11:09:42 +0800
Subject: [PATCH] fix 修改无法终止流程bug，补充注释
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 440d43c..9b60f34 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -236,10 +236,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
- PageQuery pageQuery = new PageQuery();
- pageQuery.setPageNum(taskBo.getPageNum());
- pageQuery.setPageSize(taskBo.getPageSize());
+ public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
String userId = String.valueOf(LoginHelper.getUserId());
@@ -276,7 +273,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
TaskQuery query = QueryUtils.taskQuery();
if (StringUtils.isNotBlank(taskBo.getName())) {
query.taskNameLike("%" + taskBo.getName() + "%");
@@ -288,7 +285,7 @@
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
query.orderByTaskCreateTime().desc();
- List<Task> taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<Task> taskList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<ProcessInstance> processInstanceList = null;
if (CollUtil.isNotEmpty(taskList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskList, Task::getProcessInstanceId);
@@ -320,7 +317,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
String userId = String.valueOf(LoginHelper.getUserId());
HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
query.taskAssignee(userId).finished().orderByHistoricTaskInstanceStartTime().desc();
@@ -333,7 +330,7 @@
if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
- List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<HistoricProcessInstance> historicProcessInstanceList = null;
if (CollUtil.isNotEmpty(taskInstanceList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);
@@ -363,10 +360,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
- PageQuery pageQuery = new PageQuery();
- pageQuery.setPageNum(taskBo.getPageNum());
- pageQuery.setPageSize(taskBo.getPageSize());
+ public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
String userId = String.valueOf(LoginHelper.getUserId());
if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -395,7 +389,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
query.finished().orderByHistoricTaskInstanceStartTime().desc();
if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -407,7 +401,7 @@
if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
- List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<HistoricProcessInstance> historicProcessInstanceList = null;
if (CollUtil.isNotEmpty(taskInstanceList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);
@@ -479,10 +473,8 @@
throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED);
}
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery()
- .processInstanceBusinessKey(task.getProcessInstanceId()).singleResult();
- if (ObjectUtil.isNotEmpty(historicProcessInstance) && BusinessStatusEnum.TERMINATION.getStatus().equals(historicProcessInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
- }
+ .processInstanceId(task.getProcessInstanceId()).singleResult();
+ BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
try {
if (StringUtils.isBlank(terminationBo.getComment())) {
terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "缁堟浜嗙敵璇�");
@@ -496,9 +488,9 @@
if (CollectionUtil.isNotEmpty(subTasks)) {
subTasks.forEach(e -> taskService.deleteTask(e.getId()));
}
+ runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus());
runtimeService.deleteProcessInstance(task.getProcessInstanceId(), StrUtil.EMPTY);
}
- runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus());
FlowProcessEventHandler processHandler = flowEventStrategy.getProcessHandler(historicProcessInstance.getProcessDefinitionKey());
if (processHandler != null) {
processHandler.handleProcess(historicProcessInstance.getBusinessKey(), BusinessStatusEnum.TERMINATION.getStatus(), false);
@@ -657,9 +649,7 @@
ExecutionChildByExecutionIdCmd childByExecutionIdCmd = new ExecutionChildByExecutionIdCmd(task.getExecutionId());
List<ExecutionEntity> executionEntities = managementService.executeCommand(childByExecutionIdCmd);
//鏍￠獙鍗曟嵁
- if (BusinessStatusEnum.BACK.getStatus().equals(processInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡閫�鍥烇紒");
- }
+ BusinessStatusEnum.checkBackStatus(processInstance.getBusinessStatus());
//鍒ゆ柇鏄惁鏈夊涓换鍔�
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
//鐢宠浜鸿妭鐐�
--
Gitblit v1.9.3