admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修改无法终止流程bug，补充注释

Browse Source
This commit is contained in:
gssong 2024-03-09 11:09:42 +08:00
parent 81b2999dc4
commit fe13fd899c
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java
View File

@ -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;
/**
* 审批意见
*/

3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java
View File

@ -17,7 +17,8 @@ public interface IActModelService {
/**
* 分页查询模型
*
* @param modelBo 模型参数
* @param modelBo 模型参数
* @param pageQuery 参数
* @return 返回分页列表
*/
TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery);

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java
View File

@ -18,6 +18,7 @@ public interface IActProcessDefinitionService {
* 分页查询
*
* @param processDefinitionBo 参数
* @param pageQuery 分页
* @return 返回分页列表
*/
TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery);

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java
View File

@ -36,6 +36,7 @@ public interface IActProcessInstanceService {
* 分页查询正在运行的流程实例
*
* @param processInstanceBo 参数
* @param pageQuery 分页
* @return 结果
*/
TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
@ -44,6 +45,7 @@ public interface IActProcessInstanceService {
* 分页查询已结束的流程实例
*
* @param processInstanceBo 参数
* @param pageQuery 分页
* @return 结果
*/
TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);

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

@ -33,7 +33,8 @@ public interface IActTaskService {
/**
* 查询当前用户的待办任务
*
* @param taskBo 参数
* @param taskBo 参数
* @param pageQuery 分页
* @return 结果
*/
TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery);
@ -41,7 +42,8 @@ public interface IActTaskService {
/**
* 查询当前租户所有待办任务
*
* @param taskBo 参数
* @param taskBo 参数
* @param pageQuery 分页
* @return 结果
*/
TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery);
@ -50,7 +52,8 @@ public interface IActTaskService {
/**
* 查询当前用户的已办任务
*
* @param taskBo 参数
* @param taskBo 参数
* @param pageQuery 参数
* @return 结果
*/
TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery);
@ -58,7 +61,8 @@ public interface IActTaskService {
/**
* 查询当前用户的抄送
*
* @param taskBo 参数
* @param taskBo 参数
* @param pageQuery 参数
* @return 结果
*/
TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery);
@ -66,7 +70,8 @@ public interface IActTaskService {
/**
* 查询当前租户所有已办任务
*
* @param taskBo 参数
* @param taskBo 参数
* @param pageQuery 参数
* @return 结果
*/
TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery);

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@ -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);