dev
parent
36cb174ae3
commit
a9bb7003a2
|
|
@ -26,7 +26,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) {
|
public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state) {
|
||||||
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.cutoff_time, c.complete_time" +
|
", 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" +
|
", 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() + "%");
|
paraList.add("%" + truck_license.trim() + "%");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (state != null) {
|
||||||
|
fromsql += " and c.state = ? \n";
|
||||||
|
paraList.add(state);
|
||||||
|
}
|
||||||
|
|
||||||
String totalRowSql = "select count(*) " + fromsql;
|
String totalRowSql = "select count(*) " + fromsql;
|
||||||
String findSql = selectsql + fromsql;
|
String findSql = selectsql + fromsql;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,8 @@ public class OrderclusterTruckController extends Controller {
|
||||||
String etm = get("etm");
|
String etm = get("etm");
|
||||||
String customer_name = get("customer_name");
|
String customer_name = get("customer_name");
|
||||||
String truck_license = get("truck_license");
|
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)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,8 @@ public class OrderclusterTruckController extends Controller {
|
||||||
String etm = get("etm");
|
String etm = get("etm");
|
||||||
String customer_name = get("customer_name");
|
String customer_name = get("customer_name");
|
||||||
String truck_license = get("truck_license");
|
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)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue