diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index c25603d..0348dba 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -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(); diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index 5eb7bd5..e974627 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -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); }