From bdb26c4104d30fc2c535501843a58519243705f8 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 14 Mar 2025 15:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cowr/ssjygl/overall/OverallService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index cce1dd9..b457378 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -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 ss = Supermarket.dao.findAll(); + List ss = Supermarket.dao.find("select * from supermarket where type = 0"); // List ss = Supermarket.dao.find("select * from supermarket where del = 0 AND type = 0"); List 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" +