From c19dd62cd80362f3917883f5573e7f668d6201e2 Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 1 Nov 2022 23:57:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=9B=91=E6=8E=A7=E5=8D=95=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8E=89=E5=85=A8=E6=B4=BE=E7=BB=99=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E5=8D=95=202=E3=80=81=E5=AD=90=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E5=94=AE=E5=90=8E=E6=83=85=E5=86=B5=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E9=99=A4=E5=94=AE=E5=90=8E=E5=8D=95=E6=A0=8F=E5=A4=96=E7=9A=84?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=8A=B6=E6=80=81=E6=A0=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 12 ++-- .../order/OrderDetailController.java | 8 +-- .../com/ghy/order/domain/OrderMaster.java | 2 + .../mapper/order/OrderMasterMapper.xml | 56 ++++++++++++++++++- 4 files changed, 66 insertions(+), 12 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 8b8be8ac..c69cea96 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 @@ -462,9 +462,9 @@ public class OrderController extends BaseController { response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); // 统计监控单量 orderMaster.setOrderStatus(null); - orderMaster.setOrderStatuses("2,3,4,5"); + orderMaster.setFilterOnlyServOrder(true); response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster)); - orderMaster.setOrderStatuses(null); + orderMaster.setFilterOnlyServOrder(false); // 统计搁置单量 orderDetail.setShelveStatus(1); response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); @@ -1002,9 +1002,9 @@ public class OrderController extends BaseController { if (Boolean.TRUE.equals(orderDetail.getIsOverTime()) && !isOverTime) continue; // 售后记录 - AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); - afterServiceRecord.setOrderDetailId(detail.getId()); - List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); +// AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); +// afterServiceRecord.setOrderDetailId(detail.getId()); +// List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 编辑返回属性 orderListResponse.setOrderDetailId(detail.getId()); @@ -1038,7 +1038,7 @@ public class OrderController extends BaseController { orderListResponse.setOrderType(detail.getOrderType()); orderListResponse.setIsOverTime(isOverTime); orderListResponse.setChangeMoney(changeMoney); - orderListResponse.setAfterServiceRecordList(afterServiceRecordList); +// orderListResponse.setAfterServiceRecordList(afterServiceRecordList); orderListResponses.add(orderListResponse); } return orderListResponses; 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 ad1f1b91..792add99 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 @@ -335,9 +335,9 @@ public class OrderDetailController extends BaseController { } // 售后记录 - AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); - afterServiceRecord.setOrderDetailId(detail.getId()); - List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); +// AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); +// afterServiceRecord.setOrderDetailId(detail.getId()); +// List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 编辑返回属性 orderListResponse.setOrderDetailId(detail.getId()); @@ -370,7 +370,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setOrderType(detail.getOrderType()); orderListResponse.setIsOverTime(isOverTime); orderListResponse.setChangeMoney(changeMoney); - orderListResponse.setAfterServiceRecordList(afterServiceRecordList); +// orderListResponse.setAfterServiceRecordList(afterServiceRecordList); orderListResponses.add(orderListResponse); }); return voDataTable(orderListResponses, list); 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 9a084dbc..1ac0f54a 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 @@ -85,4 +85,6 @@ public class OrderMaster extends BaseEntity { private String orderMasterIds; private Boolean useTimeNotRange; + + private Boolean filterOnlyServOrder; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index ae7c3be0..9ee18c5f 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -71,9 +71,53 @@ LEFT JOIN goods g ON g.goods_id = om.goods_id + + select om.id, + om.dept_id, + om.code, + om.customer_id, + om.address_id, + om.order_type, + om.order_status, + om.pay_type, + om.pay_status, + om.worker_id, + om.pay_time, + om.rev_time, + om.expect_time_start, + om.expect_time_end, + om.create_by, + om.create_time, + om.remark, + om.goods_id + from order_master om + left join ( + select om.id, count(om.id) as subOrderCount, max(od.worker_id) as odWorkerId from order_master om + left join order_detail od on od.order_master_id = om.id + group by om.id) odCount + on odCount.id = om.id + + + + select count(*) from order_master om + left join ( + select om.id, count(om.id) as subOrderCount, max(od.worker_id) as odWorkerId from order_master om + left join order_detail od on od.order_master_id = om.id + group by om.id) odCount + on odCount.id = om.id + +