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

bug修改

dev
wany 2025-03-11 10:36:49 +08:00
parent d9e59a123b
commit b29dde7150
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,8 @@ public class OrderStatService {
}
sql += " ) a\n" +
" left join supermarket s on s.id = a.supermarket_id\n";
" left join supermarket s on s.id = a.supermarket_id\n" +
" where s.type = 0";
return Db.find(sql, paraTempList.toArray());
}
@ -1929,7 +1930,7 @@ public class OrderStatService {
" and t.create_time <= ? \n" +
paramsSql +
" group by t.supermarket_id,t.product_id,t.product_name\n" +
") a on s.id = a.id order by s.id", paramsArray.toArray());
") a on s.id = a.id where s.type = 0 order by s.id", paramsArray.toArray());
} else {
list = Db.find("select s.id, s.name, a.cnt, a.total_price, a.total_weight from supermarket s\n" +
"left join (\n" +
@ -1940,7 +1941,7 @@ public class OrderStatService {
" and t.create_time >= ? \n" +
" and t.create_time <= ? \n" +
" group by t.supermarket_id\n" +
") a on s.id = a.id order by s.id", paramsArray.toArray());
") a on s.id = a.id where s.type = 0 order by s.id", paramsArray.toArray());
}
Record hj = new Record();

2
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
View File

@ -65,7 +65,7 @@ public class TransportService extends BaseService {
fromsql += " and t.supermarket_id = ? \n";
paraList.add(supermarket_id);
}
if (supermarket_type != null && supermarket_type > 0) {
if (supermarket_type != null) {
fromsql += " and s.type = ? \n";
paraList.add(supermarket_type);
}