From a478faa6bb6b1bafb77cc88a4a5abc3606240bf6 Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 7 Nov 2022 22:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 2 +- .../src/main/resources/mapper/order/OrderMasterMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 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 73097be3..f92a15a4 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 @@ -212,8 +212,8 @@ public class OrderController extends BaseController { // 判断是否全部派完 if(request.getIsAll() == 1){ om.setOrderStatus(OrderStatus.GOING.code()); - orderMasterService.updateOrderMaster(om); } + orderMasterService.updateOrderMaster(om); // 创建子订单 OrderDetail od = new OrderDetail(); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 02fbf0c4..4b33bb8a 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -78,7 +78,7 @@ - AND all_self_assigned = 0 AND om.order_status in (2,3,4,5) + AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5) AND om.dept_id = #{deptId} @@ -152,7 +152,7 @@ SELECT COUNT(*) FROM order_master om - AND all_self_assigned = 0 AND om.order_status in (2,3,4,5) + AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5) AND om.dept_id = #{deptId}