首页统计修改
parent
aff0163cba
commit
bdb26c4104
|
|
@ -303,13 +303,13 @@ group by date
|
|||
" group by t.supermarket_id\n" +
|
||||
" ) a on a.supermarket_id = s.id \n" +
|
||||
" where s.id = ? " +
|
||||
// "AND s.type = 0" +
|
||||
"AND s.type = 0" +
|
||||
"", OrderStateEnum.RECEIVED.getStateid(), supermarket_id, supermarket_id);
|
||||
} else {
|
||||
by_supermarket_list = Db.find(sql_by_supermarket +
|
||||
" group by t.supermarket_id\n" +
|
||||
" ) a on a.supermarket_id = s.id" +
|
||||
// " AND s.type = 0" +
|
||||
" where s.type = 0" +
|
||||
"", OrderStateEnum.RECEIVED.getStateid());
|
||||
}
|
||||
|
||||
|
|
@ -657,7 +657,7 @@ group by date
|
|||
String end = DateTimeUtil.sdf.get().format(c.getTime());
|
||||
String[] ds = new String[]{start, end};
|
||||
|
||||
List<Supermarket> ss = Supermarket.dao.findAll();
|
||||
List<Supermarket> ss = Supermarket.dao.find("select * from supermarket where type = 0");
|
||||
// List<Supermarket> ss = Supermarket.dao.find("select * from supermarket where del = 0 AND type = 0");
|
||||
|
||||
List<Record> list = Db.find("select date_format(t.create_time, '%Y-%m-%d') date, count(t.sn) total_cnt, sum(t.weight) total_weight, sum(t.total_price) total_price, t.supermarket_id id\n" +
|
||||
|
|
|
|||
Loading…
Reference in New Issue