From 2bdc297c6c8b5b8354abfc4d439f4a054747f600 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 1 Dec 2024 16:11:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/enums/BusinessStatusEnum.java | 30 +++++++++++++++++++
 .../service/impl/FlwInstanceServiceImpl.java  |  8 ++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
index 580d8b136..adb82e5c0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
@@ -6,7 +6,10 @@ import lombok.Getter;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StringUtils;
 
+import java.sql.Array;
+import java.util.ArrayList;
 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 运行中的实例状态
+     */
+    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;
+    }
+
     /**
      * 启动流程校验
      *
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
index 7c26fc727..fe454d94c 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -51,10 +51,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 流程实例 服务层实现
@@ -86,6 +83,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
     @Override
     public TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery) {
         QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("t.flow_status", BusinessStatusEnum.runningStatus());
         Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper);
         TableDataInfo<FlowInstanceVo> build = TableDataInfo.build();
         build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class));
@@ -102,7 +100,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
     @Override
     public TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery) {
         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);
         TableDataInfo<FlowInstanceVo> build = TableDataInfo.build();
         build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class));