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

加上藕山的数据查询

dev
徐杰盟 2023-11-09 09:16:47 +08:00
parent a833406681
commit 6d2ff8a9f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -2220,7 +2220,7 @@ public class OrderStatService {
Record rec = new Record().set("id", 99).set("name", "石畈处置砂").set("isdeploy", 1).set("del", 0); Record rec = new Record().set("id", 99).set("name", "石畈处置砂").set("isdeploy", 1).set("del", 0);
List<Record> sups = Db.find("select t.*, s.yield from supermarket t \n" + List<Record> sups = Db.find("select t.*, s.yield from supermarket t \n" +
" left join supermarket_yield s on s.supermarket_id = t.id and s.year = ? \n" + " left join supermarket_yield s on s.supermarket_id = t.id and s.year = ? \n" +
" where id <= 6 or id = 11 ", year); " where id <= 6 or id = 11 or id = 12 ", year);
if (sups.size() > 0) { if (sups.size() > 0) {
sups.add(rec); sups.add(rec);
} }
@ -2858,7 +2858,7 @@ public class OrderStatService {
" supermarket t\n" + " supermarket t\n" +
"WHERE\n" + "WHERE\n" +
" id <= 6\n" + " id <= 6\n" +
"OR id = 11"); "OR id = 11 or id = 12 ");
// 预售金额统计 // 预售金额统计
List<Object> paraList1 = new ArrayList<>(); List<Object> paraList1 = new ArrayList<>();
@ -3157,7 +3157,7 @@ public class OrderStatService {
" supermarket t\n" + " supermarket t\n" +
"WHERE\n" + "WHERE\n" +
" id <= 6\n" + " id <= 6\n" +
"OR id = 11"); "OR id = 11 or id = 12 ");
List<Object> shParamsList = new ArrayList<>(); List<Object> shParamsList = new ArrayList<>();
List<Object> yhParamsList = new ArrayList<>(); List<Object> yhParamsList = new ArrayList<>();