From a9bb7003a295c0a72e317ba5ad12e4504ba4f230 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 2 Nov 2020 22:24:50 +0800 Subject: [PATCH] . --- .../order/ordercluster/truck/OrderclusterTruckService.java | 7 ++++++- .../ordercluster/truck/OrderclusterTruckController.java | 3 ++- .../ordercluster/truck/OrderclusterTruckController.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 76ab35d..5af8c15 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -26,7 +26,7 @@ import java.util.List; public class OrderclusterTruckService extends BaseService { public static final OrderclusterTruckService me = new OrderclusterTruckService(); - public Page find(PageParam pp, String stm, String etm, String customer_name, String truck_license) { + public Page find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state) { String selectsql = "select t.id, t.truck_license" + ", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.cutoff_time, c.complete_time" + ", c.unit_price, c.state, c.supermarket_id, c.trans_distance, c.pay_type, c.create_user_id" + @@ -64,6 +64,11 @@ public class OrderclusterTruckService extends BaseService { paraList.add("%" + truck_license.trim() + "%"); } + if (state != null) { + fromsql += " and c.state = ? \n"; + paraList.add(state); + } + String totalRowSql = "select count(*) " + fromsql; String findSql = selectsql + fromsql; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java index f29b3f7..75ddcb7 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java @@ -38,7 +38,8 @@ public class OrderclusterTruckController extends Controller { String etm = get("etm"); String customer_name = get("customer_name"); String truck_license = get("truck_license"); - renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license))); + Integer state = getInt("state"); + renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java index 2a32a55..e73c6ee 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java @@ -75,7 +75,8 @@ public class OrderclusterTruckController extends Controller { String etm = get("etm"); String customer_name = get("customer_name"); String truck_license = get("truck_license"); - renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license))); + Integer state = getInt("state"); + renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state))); } /**