diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java index 61b761678..8f2206e82 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java @@ -24,12 +24,6 @@ public class TerminationBo implements Serializable { @NotBlank(message = "任务id为空", groups = AddGroup.class) private String taskId; - /** - * 转办人id - */ - @NotBlank(message = "转办人不能为空", groups = AddGroup.class) - private String userId; - /** * 审批意见 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java index bf5a42326..58bca06cf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java @@ -17,7 +17,8 @@ public interface IActModelService { /** * 分页查询模型 * - * @param modelBo 模型参数 + * @param modelBo 模型参数 + * @param pageQuery 参数 * @return 返回分页列表 */ TableDataInfo page(ModelBo modelBo, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java index 9ae5b4385..d09d72b8f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java @@ -18,6 +18,7 @@ public interface IActProcessDefinitionService { * 分页查询 * * @param processDefinitionBo 参数 + * @param pageQuery 分页 * @return 返回分页列表 */ TableDataInfo page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java index cf97168a4..e5ed6ca0c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java @@ -36,6 +36,7 @@ public interface IActProcessInstanceService { * 分页查询正在运行的流程实例 * * @param processInstanceBo 参数 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); @@ -44,6 +45,7 @@ public interface IActProcessInstanceService { * 分页查询已结束的流程实例 * * @param processInstanceBo 参数 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java index a90674b9a..a40c3d737 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java @@ -33,7 +33,8 @@ public interface IActTaskService { /** * 查询当前用户的待办任务 * - * @param taskBo 参数 + * @param taskBo 参数 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery); @@ -41,7 +42,8 @@ public interface IActTaskService { /** * 查询当前租户所有待办任务 * - * @param taskBo 参数 + * @param taskBo 参数 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery); @@ -50,7 +52,8 @@ public interface IActTaskService { /** * 查询当前用户的已办任务 * - * @param taskBo 参数 + * @param taskBo 参数 + * @param pageQuery 参数 * @return 结果 */ TableDataInfo getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery); @@ -58,7 +61,8 @@ public interface IActTaskService { /** * 查询当前用户的抄送 * - * @param taskBo 参数 + * @param taskBo 参数 + * @param pageQuery 参数 * @return 结果 */ TableDataInfo getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery); @@ -66,7 +70,8 @@ public interface IActTaskService { /** * 查询当前租户所有已办任务 * - * @param taskBo 参数 + * @param taskBo 参数 + * @param pageQuery 参数 * @return 结果 */ TableDataInfo getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery); 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 ac41de97e..9b60f349d 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 @@ -473,7 +473,7 @@ public class ActTaskServiceImpl implements IActTaskService { throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED); } HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery() - .processInstanceBusinessKey(task.getProcessInstanceId()).singleResult(); + .processInstanceId(task.getProcessInstanceId()).singleResult(); BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus()); try { if (StringUtils.isBlank(terminationBo.getComment())) { @@ -488,9 +488,9 @@ public class ActTaskServiceImpl implements IActTaskService { 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);