From f872cddd93f172287c6aac98aee67e82c580f76b Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 6 Mar 2024 16:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/ssjygl/order/orderend/OrderEndService.java | 4 ++-- .../com/cowr/ssjygl/order/ordertemp/OrderTempService.java | 2 +- .../service/ssjygl/order/ordertemp/OrderTempController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java index db3d7df..46ab371 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java @@ -101,11 +101,11 @@ public class OrderEndService extends BaseService { - public void queryList(String supermarketId,String tm,String customerId,String stm,String etm) { + public void queryList(String tm,String customerId,String supermarketId,String stm,String etm) { // 获取历史数据 - List tempList = OrderTempService.me.getOrderTempGroupBy(supermarketId,tm,customerId,stm,etm); + List tempList = OrderTempService.me.getOrderTempGroupBy(tm,customerId,supermarketId,stm,etm); if (CollectionUtils.isEmpty(tempList)) { log.info("数据结果为空"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 58c9b5f..d841b4b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -467,7 +467,7 @@ public class OrderTempService extends BaseService { paraList.add(supermarketId); } - if (supermarketId != null) { + if (customerId != null) { findSql = " AND CUSTOMER_ID = ? \n"; paraList.add(customerId); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java index f9bc087..ae4d5d7 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java @@ -121,7 +121,7 @@ public class OrderTempController extends BaseController { String supermarketId = get("supermarketId"); String stm = get("stm"); String etm = get("etm"); - OrderEndService.me.queryList(supermarketId,tm, customerId,stm,etm); // 通过接口更新 + OrderEndService.me.queryList(tm, customerId,supermarketId,stm,etm); // 通过接口更新 renderJson(); } }