abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整流程实例状态查询

Browse Source
This commit is contained in:
gssong 2024-12-01 16:11:04 +08:00
parent 4a43f48120
commit 2bdc297c6c
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
View File

@ -6,7 +6,10 @@ import lombok.Getter;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import java.sql.Array;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* 业务状态枚举 * 业务状态枚举
@ -87,6 +90,33 @@ public enum BusinessStatusEnum {
return DRAFT.status.equals(status) || CANCEL.status.equals(status) || BACK.status.equals(status); return DRAFT.status.equals(status) || CANCEL.status.equals(status) || BACK.status.equals(status);
} }
/**
* 运行中的实例状态
*
* @return 运行中的实例状态
*/
public static List<String> runningStatus() {
List<String> list = new ArrayList<>();
list.add(BusinessStatusEnum.DRAFT.getStatus());
list.add(BusinessStatusEnum.WAITING.getStatus());
list.add(BusinessStatusEnum.BACK.getStatus());
list.add(BusinessStatusEnum.CANCEL.getStatus());
return list;
}
/**
* 结束实例状态
*
* @return 结束实例状态
*/
public static List<String> finishStatus() {
List<String> list = new ArrayList<>();
list.add(BusinessStatusEnum.FINISH.getStatus());
list.add(BusinessStatusEnum.INVALID.getStatus());
list.add(BusinessStatusEnum.TERMINATION.getStatus());
return list;
}
/** /**
* 启动流程校验 * 启动流程校验
* *

8
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -51,10 +51,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 流程实例 服务层实现 * 流程实例 服务层实现
@ -86,6 +83,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
@Override @Override
public TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery) {
QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>(); QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>();
queryWrapper.in("t.flow_status", BusinessStatusEnum.runningStatus());
Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper);
TableDataInfo<FlowInstanceVo> build = TableDataInfo.build(); TableDataInfo<FlowInstanceVo> build = TableDataInfo.build();
build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class)); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class));
@ -102,7 +100,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
@Override @Override
public TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery) {
QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>(); QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("t.flow_status", BusinessStatusEnum.FINISH.getStatus()); queryWrapper.in("t.flow_status", BusinessStatusEnum.finishStatus());
Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper);
TableDataInfo<FlowInstanceVo> build = TableDataInfo.build(); TableDataInfo<FlowInstanceVo> build = TableDataInfo.build();
build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class)); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class));