From 92bf1bb533b4cbcdf74f4b3a44b48932a89fb23f Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 17 May 2023 20:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8F=8A=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 5 +++++ .../java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java | 2 ++ .../src/main/resources/mapper/order/OrderMasterMapper.xml | 4 ++-- 3 files changed, 9 insertions(+), 2 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 e031fecb..85408813 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 @@ -665,9 +665,11 @@ public class OrderController extends BaseController { try { OrderMaster orderMaster = new OrderMaster(); + orderMaster.setDeptId(request.getDeptId()); orderMaster.setOrderStatus(OrderStatus.RECEIVE.code()); orderMaster.setWorkerId(request.getWorkerId()); OrderDetail orderDetail = new OrderDetail(); + orderDetail.setDeptId(request.getDeptId()); orderDetail.setOrderStatus(OrderStatus.RECEIVE.code()); orderDetail.setWorkerId(request.getWorkerId()); orderDetail.setShelveStatus(0); @@ -721,11 +723,13 @@ public class OrderController extends BaseController { orderMaster.setIsMonitoredOrder(false); // 统计搁置单量 OrderDetail orderDetail1 = new OrderDetail(); + orderDetail1.setDeptId(request.getDeptId()); orderDetail1.setWorkerId(request.getWorkerId()); orderDetail1.setShelveStatus(1); response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail1)); // 统计售后中单量 OrderListRequest orderListRequest = new OrderListRequest(); + orderListRequest.setDeptId(request.getDeptId()); orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setIsMonitoredOrder(true); orderListRequest.setAllSelfAssigned(0); @@ -734,6 +738,7 @@ public class OrderController extends BaseController { response.setAfterListNum(afterList.size()); // 统计超时单量 orderListRequest = new OrderListRequest(); + orderListRequest.setDeptId(request.getDeptId()); orderListRequest.setTimeout(1); orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setIsMonitoredOrder(true); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java index 98811874..09b3979b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java @@ -11,4 +11,6 @@ import lombok.Data; @Data public class OrderStatisticsRequest { private Long workerId; + + private Long deptId; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 9a3c35bd..634df086 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -88,7 +88,7 @@ - AND all_self_assigned = 0 AND om.order_status in (1,2,3,4) + AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (1,2,3,4) AND all_self_assigned = #{allSelfAssigned} @@ -183,7 +183,7 @@ SELECT COUNT(*) FROM order_master om - AND all_self_assigned = 0 AND om.order_status in (1,2,3,4) + AND (om.all_self_assigned = 0 or om.all_self_assigned is not null) AND om.order_status in (1,2,3,4) AND om.dept_id = #{deptId}