From 3999663306a14c245abcae6bf1a07b8263ec4daf Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 6 Oct 2022 17:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E4=B8=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 ++ ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 1fac33e2..36dce88e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -232,6 +232,8 @@ public class OrderMasterController extends BaseController { List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); StringBuilder orderDetailIds = new StringBuilder(); OrderDetail orderDetail = new OrderDetail(); + orderDetail.setCustomerId(orderMaster.getCustomerId()); + orderDetail.setDeptId(orderMaster.getDeptId()); detailIds.forEach(id->{ orderDetailIds.append(id).append(","); }); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 711ab1a4..e85815e5 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -120,7 +120,7 @@ AND om.create_time < #{createTimeEnd} - AND om.id in (#{orderMasterIds}) + AND om.id in (${orderMasterIds}) order by om.create_time