From 93436775cda28a92c263e75bd6647e65280f179d Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 9 Nov 2022 01:03:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=AD=E5=90=84=E4=B8=AA=E5=AD=90=E5=8D=95=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D=202=E3=80=81=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E4=B8=AD=E5=92=8C=E5=94=AE=E5=90=8E=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=8E=89=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E6=89=BF=E6=8E=A5=E7=9A=84=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=B9=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 2 ++
 .../src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java     | 2 ++
 2 files changed, 4 insertions(+)

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 f92a15a4..5f97c881 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
@@ -482,6 +482,7 @@ public class OrderController extends BaseController {
             // 统计售后中单量
             OrderListRequest orderListRequest = new OrderListRequest();
             orderListRequest.setWorkerId(request.getWorkerId());
+            orderListRequest.setIsMonitoredOrder(true);
             AjaxResult afterListRes = this.appMixAfterList(orderListRequest);
             List<AfterServiceRecord> afterList = (List<AfterServiceRecord>)afterListRes.get("data");
             response.setAfterListNum(afterList.size());
@@ -489,6 +490,7 @@ public class OrderController extends BaseController {
             orderListRequest = new OrderListRequest();
             orderListRequest.setIsOverTime(true);
             orderListRequest.setWorkerId(request.getWorkerId());
+            orderListRequest.setIsMonitoredOrder(true);
             AjaxResult overTimeRes = this.appMixOrderList(orderListRequest);
             List<OrderListResponse> overTimeList = (List)overTimeRes.get("data");
             response.setOverTimeOrderNum(overTimeList.size());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java
index 16d517a0..0373b011 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java
@@ -23,4 +23,6 @@ public class OrderListRequest {
     private Long countryId;
 
     private Boolean isOverTime;
+
+    private Boolean isMonitoredOrder;
 }