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

Compare commits

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

3 Commits
e35adc1da2 ... 24a7275f5c

Author SHA1 Message Date
wany 24a7275f5c bug修改 2025-03-08 14:59:32 +08:00
wany c367f8e705 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
 2025-03-08 13:19:35 +08:00
wany f2d93a8cb2 bug修改 2025-03-08 13:18:49 +08:00
4 changed files with 13 additions and 5 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 sale_type
) {
String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id ";
String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id, c.name customer_name ";
String fromsql = "from ordercluster t \n" +
" left join supermarket s on s.id = t.supermarket_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)) {
fromsql += " and t.customer_name like ? \n";
fromsql += " and c.customer_name like ? \n";
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 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) {
public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type,Integer supermarket_id) {
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.unit_price, c.state, c.supermarket_id, c.trans_distance, c.pay_type, c.create_user_id" +
@ -67,6 +67,12 @@ public class OrderclusterTruckService extends BaseService {
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) {
fromsql += " and c.state = ? \n";
paraList.add(state);

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

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