xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xjm:24a7275f5c723cf8e10885e5b29d5413e3c33f49
Branches Tags
xjm:master
..
compare: xjm:e35adc1da221cfdfa3f3da86f8109dc50221ce8f
Branches Tags
xjm:master

No commits in common. "24a7275f5c723cf8e10885e5b29d5413e3c33f49" and "e35adc1da221cfdfa3f3da86f8109dc50221ce8f" have entirely different histories.
24a7275f5c ... e35adc1da2

4 changed files with 5 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java
View File

@ -235,7 +235,7 @@ public class OrderclusterService extends BaseService {
Integer product_id, Integer product_id,
Integer sale_type Integer sale_type
) { ) {
String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id, c.name customer_name "; String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id ";
String fromsql = "from ordercluster t \n" + String fromsql = "from ordercluster t \n" +
" left join supermarket s on s.id = t.supermarket_id \n " + " left join supermarket s on s.id = t.supermarket_id \n " +
" left join customer c on c.id = t.customer_id \n " + " left join customer c on c.id = t.customer_id \n " +
@ -263,7 +263,7 @@ public class OrderclusterService extends BaseService {
} }
if (StrKit.notBlank(customer_name)) { if (StrKit.notBlank(customer_name)) {
fromsql += " and c.customer_name like ? \n"; fromsql += " and t.customer_name like ? \n";
paraList.add("%" + customer_name.trim() + "%"); paraList.add("%" + customer_name.trim() + "%");
} }

8
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java
View File

@ -25,7 +25,7 @@ import java.util.List;
public class OrderclusterTruckService extends BaseService { public class OrderclusterTruckService extends BaseService {
public static final OrderclusterTruckService me = new OrderclusterTruckService(); public static final OrderclusterTruckService me = new OrderclusterTruckService();
public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type,Integer supermarket_id) { public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type) {
String selectsql = "select t.id, t.truck_license" + String selectsql = "select t.id, t.truck_license" +
", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.start_time, c.cutoff_time, c.complete_time" + ", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.start_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" + ", c.unit_price, c.state, c.supermarket_id, c.trans_distance, c.pay_type, c.create_user_id" +
@ -67,12 +67,6 @@ public class OrderclusterTruckService extends BaseService {
paraList.add("%" + truck_license.trim() + "%"); paraList.add("%" + truck_license.trim() + "%");
} }
if(supermarket_id != null){
fromsql += " and (c.supermarket_id = ? or c.customer_id = ?) \n";
paraList.add(supermarket_id);
paraList.add(supermarket_id);
}
if (state != null) { if (state != null) {
fromsql += " and c.state = ? \n"; fromsql += " and c.state = ? \n";
paraList.add(state); paraList.add(state);

3
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java
View File

@ -42,8 +42,7 @@ public class OrderclusterTruckController extends Controller {
String truck_license = get("truck_license"); String truck_license = get("truck_license");
Integer supermarket_type = getInt("supermarket_type"); Integer supermarket_type = getInt("supermarket_type");
Integer state = getInt("state"); Integer state = getInt("state");
Integer supermarket_id = getInt("supermarket_id"); renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state, supermarket_type)));
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state, supermarket_type, supermarket_id)));
} }
/** /**

3
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java
View File

@ -80,8 +80,7 @@ public class OrderclusterTruckController extends Controller {
String truck_license = get("truck_license"); String truck_license = get("truck_license");
Integer state = getInt("state"); Integer state = getInt("state");
Integer supermarket_type = getInt("supermarket_type"); Integer supermarket_type = getInt("supermarket_type");
Integer supermarket_id = getInt("supermarket_id"); renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state,supermarket_type)));
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state,supermarket_type,supermarket_id)));
} }
/** /**