From 866a701f3161b00508b95188f3ff27378839c29e Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 21 Nov 2022 00:57:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E6=8A=A5/=E8=B6=85=E6=97=B6/=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E4=B8=89=E4=B8=AA=E7=8A=B6=E6=80=81=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=85=A8=E9=83=A8=E8=87=AA=E5=B7=B1=E6=89=BF=E6=8E=A5?= =?UTF-8?q?=E7=9A=84=E7=9B=91=E6=8E=A7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderController.java | 15 +++++++++++---- .../controller/order/OrderDetailController.java | 1 + .../com/ghy/web/pojo/vo/OrderListRequest.java | 4 ++++ .../com/ghy/web/pojo/vo/OrderListResponse.java | 2 ++ .../resources/mapper/customer/CustomerMapper.xml | 3 +++ .../java/com/ghy/order/domain/OrderMaster.java | 2 ++ .../resources/mapper/order/OrderDetailMapper.xml | 4 ++++ .../resources/mapper/order/OrderMasterMapper.xml | 3 +++ 8 files changed, 30 insertions(+), 4 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 dead6270..1a5895ea 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 @@ -485,13 +485,19 @@ public class OrderController extends BaseController { response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); orderMaster.setIsMonitoredOrder(false); // 统计搁置单量 - orderDetail.setShelveStatus(1); - response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); - orderDetail.setShelveStatus(0); - // 统计售后中单量 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()); + // 统计售后中单量 + orderListRequest = new OrderListRequest(); + orderListRequest.setWorkerId(request.getWorkerId()); + orderListRequest.setIsMonitoredOrder(true); + orderListRequest.setAllSelfAssigned(0); AjaxResult afterListRes = this.appMixAfterList(orderListRequest); List afterList = (List)afterListRes.get("data"); response.setAfterListNum(afterList.size()); @@ -500,6 +506,7 @@ public class OrderController extends BaseController { orderListRequest.setIsOverTime(true); orderListRequest.setWorkerId(request.getWorkerId()); orderListRequest.setIsMonitoredOrder(true); + orderListRequest.setAllSelfAssigned(0); AjaxResult overTimeRes = this.appMixOrderList(orderListRequest); List overTimeList = (List)overTimeRes.get("data"); response.setOverTimeOrderNum(overTimeList.size()); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 68ecc3d2..ad660287 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -378,6 +378,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setIsOverTime(isOverTime); orderListResponse.setChangeMoney(changeMoney); // orderListResponse.setAfterServiceRecordList(afterServiceRecordList); + orderListResponse.setUpdateTime(detail.getUpdateTime()); orderListResponses.add(orderListResponse); }); return voDataTable(orderListResponses, list); 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 0373b011..4261aecf 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 @@ -25,4 +25,8 @@ public class OrderListRequest { private Boolean isOverTime; private Boolean isMonitoredOrder; + + private Integer shelveStatus; + + private Integer allSelfAssigned; } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 86a6ebbd..8752a826 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -100,4 +100,6 @@ public class OrderListResponse { private List afterServiceRecordList; private Boolean isOnlyServ; + + private Date updateTime; } diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml index 01df8c74..ddf76679 100644 --- a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml @@ -44,6 +44,9 @@ AND customer_place = #{customerPlace} + + AND place_status = #{placeStatus} + diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 37c1c192..7dcca024 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -95,4 +95,6 @@ public class OrderMaster extends BaseEntity { private Integer hasDispatchedAll; private List customerIds; + + private Boolean shelveStatus; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 616cbd46..89fccd06 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -65,6 +65,7 @@ od.clock_in_location, od.create_by, od.create_time, + od.update_time, od.remark FROM order_detail od LEFT JOIN order_master om ON om.id = od.order_master_id @@ -114,6 +115,9 @@ AND od.shelve_status = ${shelveStatus} + + AND od.shelve_status = 0 + order by od.create_time diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index d52c118c..c946d28b 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -80,6 +80,9 @@ AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5) + + AND all_self_assigned = #{allSelfAssigned} + AND om.dept_id = #{deptId}