From 2c69be80f95df2e47887da9cdac99cdfae3e3646 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 6 May 2025 17:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B4=BE=E9=81=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkOrderInfoController.java     |  8 ++++++++
 .../platform/domain/vo/WorkOrderInfoVo.java     |  1 +
 .../platform/service/IWorkOrderInfoService.java |  2 ++
 .../service/impl/WorkOrderInfoServiceImpl.java  | 17 ++++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
index be3f33b..b5cdc58 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
@@ -186,4 +186,12 @@ public class WorkOrderInfoController extends BaseController {
         TableDataInfo<WorkOrderInfoVo> rs = workOrderInfoService.reviewList(bo, pageQuery);
         return rs;
     }
+
+
+    @SaCheckPermission("platform:workOrder:dispatchList")
+    @GetMapping("/dispatchList")
+    public TableDataInfo<WorkOrderInfoVo> dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) {
+        TableDataInfo<WorkOrderInfoVo> rs = workOrderInfoService.dispatchList(bo, pageQuery);
+        return rs;
+    }
 }
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java
index 344efdb..6cd22dd 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java
@@ -181,6 +181,7 @@ public class WorkOrderInfoVo implements Serializable {
      * 4 初审
      * 5 终审
      * 6 结案
+     * 7 处理中(已延期)
      */
     @ExcelProperty(value = "当前状态")
     private Long status;
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java
index 03f5db0..ff5d702 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java
@@ -128,4 +128,6 @@ public interface IWorkOrderInfoService {
      * @param bo
      */
     void delaySubmit(WorkOrderDelayBo bo);
+
+    TableDataInfo<WorkOrderInfoVo> dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery);
 }
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
index 5c2c1ca..655bfab 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
@@ -406,7 +406,8 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         List<WorkOrderInfoVo> records = result.getRecords();
         List<WorkOrderInfoVo> filterRecords = records.stream()
             .filter(record -> record.getStatus() != null
-                && (record.getStatus() < 4 || record.getStatus() == 7))
+                && (record.getStatus() == 1 || record.getStatus() == 2 || record.getStatus() == 7)
+            )
             .collect(Collectors.toList());
 
         // 封装
@@ -887,4 +888,18 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
 
     }
 
+    @Override
+    public TableDataInfo<WorkOrderInfoVo> dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WorkOrderInfo> lqw = buildQueryWrapper(bo);
+        Page<WorkOrderInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<WorkOrderInfoVo> records = result.getRecords();
+        List<WorkOrderInfoVo> filterRecords = records.stream()
+            .filter(record -> record.getStatus() != null
+                && (record.getStatus() == 0 || record.getStatus() == 3)
+            )
+            .collect(Collectors.toList());
+        result.setRecords(filterRecords);
+        return TableDataInfo.build(result);
+    }
+
 }