From c2da55522fb08ea5b382924614cb55e736a76e23 Mon Sep 17 00:00:00 2001 From: donqi Date: Sat, 3 Dec 2022 22:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=8F=8A?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=87=8F=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderController.java | 14 +++++--------- .../resources/mapper/order/OrderMasterMapper.xml | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) 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 47492cab..20e773d9 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 @@ -490,16 +490,12 @@ public class OrderController extends BaseController { response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); orderMaster.setIsMonitoredOrder(false); // 统计搁置单量 - OrderListRequest orderListRequest = new OrderListRequest(); - orderListRequest.setWorkerId(request.getWorkerId()); - orderListRequest.setIsMonitoredOrder(true); - orderListRequest.setAllSelfAssigned(0); - orderListRequest.setShelveStatus(1); - AjaxResult shelveRes = this.appMixOrderList(orderListRequest); - List shelveList = (List)shelveRes.get("data"); - response.setShelvedOrderNum(shelveList.size()); + OrderDetail orderDetail1 = new OrderDetail(); + orderDetail1.setWorkerId(request.getWorkerId()); + orderDetail1.setShelveStatus(1); + response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail1)); // 统计售后中单量 - orderListRequest = new OrderListRequest(); + OrderListRequest orderListRequest = new OrderListRequest(); orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setIsMonitoredOrder(true); orderListRequest.setAllSelfAssigned(0); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 4e4239d7..c7bad953 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -164,7 +164,7 @@ SELECT COUNT(*) FROM order_master om - AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5) + AND all_self_assigned = 0 AND om.order_status in (1,2,3,4) AND om.dept_id = #{deptId}