From 7733e4f755587e4f4544255e2a658a140d881d7a Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 22 Aug 2023 23:01:00 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=8D=95=E9=87=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java     | 3 ++-
 .../src/main/resources/mapper/order/OrderMasterMapper.xml      | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 41e4f12e..c6a9b8bd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -738,8 +738,10 @@ public class OrderController extends BaseController {
             // 统计监控单量
             orderMaster.setOrderStatus(null);
             orderMaster.setIsMonitoredOrder(true);
+            orderMaster.setAllSelfAssigned(0);
             response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster));
             orderMaster.setIsMonitoredOrder(false);
+            orderMaster.setAllSelfAssigned(null);
             // 统计搁置单量
             OrderDetail orderDetail1 = new OrderDetail();
             orderDetail1.setDeptId(request.getDeptId());
@@ -761,7 +763,6 @@ public class OrderController extends BaseController {
             orderListRequest.setTimeout(1);
             orderListRequest.setWorkerId(request.getWorkerId());
             orderListRequest.setIsMonitoredOrder(true);
-            orderListRequest.setAllSelfAssigned(0);
             AjaxResult overTimeRes = this.appMixOrderList(orderListRequest);
             List<OrderListResponse> overTimeList = (List) overTimeRes.get("data");
             response.setOverTimeOrderNum(overTimeList.size());
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 73474131..a2a57888 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -214,6 +214,9 @@
             <if test="isMonitoredOrder">
                 AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (1,2,3,4)
             </if>
+            <if test="allSelfAssigned != null">
+                AND all_self_assigned = #{allSelfAssigned}
+            </if>
             <if test="deptId != null and deptId != 0">
                 AND om.dept_id = #{deptId}
             </if>