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

bug修改

dev
wany 2025-03-12 17:35:14 +08:00
parent 8c019d3b40
commit 6919173bc3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
View File

@ -101,7 +101,7 @@ public class OrderTempService extends BaseService {
Integer product_id, Integer product_id,
Boolean invoice_code_is_null Boolean invoice_code_is_null
) { ) {
String selectsql = "select t.* ,t.sn as old_sn" + String selectsql = "select t.* ,t.sn as old_sn,t.ticket_code as old_ticket_code" +
", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" +
", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" +
", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" + ", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" +

13
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -673,7 +673,6 @@ public class OrderStatService {
" ) t ON s.id = t.sandfarm_id \n" + " ) t ON s.id = t.sandfarm_id \n" +
"WHERE\n" + "WHERE\n" +
" s.type = 1 \n" + " s.type = 1 \n" +
" and s.isdeploy = 1 \n" +
"GROUP BY\n" + "GROUP BY\n" +
" s.id \n" + " s.id \n" +
"ORDER BY\n" + "ORDER BY\n" +
@ -3685,8 +3684,10 @@ public class OrderStatService {
"FROM\n" + "FROM\n" +
" supermarket t\n" + " supermarket t\n" +
"WHERE\n" + "WHERE\n" +
" id <= 6\n" + "t.type = 0"
"OR id = 11 or id = 12 "); // " id <= 6\n" +
// "OR id = 11 or id = 12 "
);
// 预售金额统计 // 预售金额统计
List<Object> paraList1 = new ArrayList<>(); List<Object> paraList1 = new ArrayList<>();
@ -4521,8 +4522,10 @@ public class OrderStatService {
"FROM\n" + "FROM\n" +
" supermarket t\n" + " supermarket t\n" +
"WHERE\n" + "WHERE\n" +
" id <= 6\n" + // " id <= 6\n" +
"OR id = 11 or id = 12 "); // "OR id = 11 or id = 12 "
"t.type = 0 "
);
List<Object> shParamsList = new ArrayList<>(); List<Object> shParamsList = new ArrayList<>();
List<Object> yhParamsList = new ArrayList<>(); List<Object> yhParamsList = new ArrayList<>();