From e23125c6dddbcd7ac877e8dd309c4e3fea93317d Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Tue, 15 Feb 2022 10:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=B0=83=E6=95=B4=20=20=20=20=20=E5=BD=93=E5=B9=B4?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=A2=84=E5=94=AE=E6=8F=90=E8=B4=A7=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8C=85=E5=90=AB=E5=BD=93=E5=B9=B4=E7=9A=84?= =?UTF-8?q?=E9=A2=84=E5=94=AE=E9=A2=9D=E5=90=88=E8=AE=A1=20=20=20=20=20?= =?UTF-8?q?=E5=BD=93=E6=9C=88=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8C=85=E5=90=AB=E9=A2=84=E5=94=AE=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8C=85=E5=90=AB=E5=BD=93?= =?UTF-8?q?=E6=9C=88=E7=9A=84=E9=A2=84=E5=94=AE=E9=A2=9D=E5=90=88=E8=AE=A1?= =?UTF-8?q?=20=20=20=20=20=E5=BD=93=E6=97=A5=E9=94=80=E5=94=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=8C=85=E5=90=AB=E9=A2=84?= =?UTF-8?q?=E5=94=AE=E6=8F=90=E8=B4=A7=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=BD=93=E6=97=A5=E7=9A=84=E9=A2=84=E5=94=AE=E9=A2=9D?= =?UTF-8?q?=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/ssjygl/overall/OverallService.java | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index d7b065d..e7fb764 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -126,7 +126,6 @@ group by date */ public Record stat(Integer supermarket_id) { - long st = System.currentTimeMillis(); Record out = new Record(); Date now = new Date(); Calendar c = Calendar.getInstance(); @@ -145,55 +144,57 @@ group by date c.set(Calendar.MONTH, 0); Date year = c.getTime(); // 当年 - String sql_ordercluster = "select\n" + - " ifnull(sum(t.weight), 0) total_weight,\n" + - " ifnull(sum(t.total_price), 0) total_price,\n" + - " ifnull(count(t.sn), 0) truck_cnt,\n" + - " \n" + - " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) day_total_weight,\n" + - " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) day_total_price,\n" + - " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) day_truck_cnt\n" + - " \n" + - " from order_temp t\n" + - " where t.state = ?"; - - String sql_ordercluster_presell = "select \n" + + String sql_ordercluster = "select \n" + + " ifnull(sum(g.total_weight), 0) total_weight,\n" + + " ifnull(sum(g.total_price), 0) total_price,\n" + + " ifnull(sum(g.truck_cnt), 0) truck_cnt,\n" + " ifnull(sum(g.year_total_weight), 0) year_total_weight,\n" + " ifnull(sum(g.year_total_price), 0) year_total_price,\n" + " ifnull(sum(g.year_truck_cnt), 0) year_truck_cnt,\n" + " ifnull(sum(g.month_total_weight), 0) month_total_weight,\n" + " ifnull(sum(g.month_total_price), 0) month_total_price,\n" + - " ifnull(sum(g.month_truck_cnt), 0) month_truck_cnt\n" + + " ifnull(sum(g.month_truck_cnt), 0) month_truck_cnt,\n" + + " ifnull(sum(g.day_total_weight), 0) day_total_weight,\n" + + " ifnull(sum(g.day_total_price), 0) day_total_price,\n" + + " ifnull(sum(g.day_truck_cnt), 0) day_truck_cnt\n" + " from \n" + " (\n" + " select \n" + + " ifnull(sum(t.weight), 0) total_weight,\n" + + " ifnull(sum(t.total_price), 0) total_price,\n" + + " ifnull(count(t.sn), 0) truck_cnt,\n" + " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) year_total_weight,\n" + " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) year_total_price,\n" + " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) year_truck_cnt,\n" + " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) month_total_weight,\n" + " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) month_total_price,\n" + - " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) month_truck_cnt\n" + + " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) month_truck_cnt,\n" + + " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) day_total_weight,\n" + + " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) day_total_price,\n" + + " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) day_truck_cnt\n" + " from order_temp t\n" + " where t.sale_type = 0\n" + " and t.state = 5\n" + " union\n" + " select \n" + + " 0 total_weight,\n" + + " ifnull(sum(p.presell_amount), 0) total_price,\n" + + " 0 truck_cnt,\n" + " 0 year_total_weight,\n" + " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) year_total_price,\n" + " 0 year_truck_cnt,\n" + " 0 month_total_weight,\n" + " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) month_total_price,\n" + - " 0 month_truck_cnt\n" + + " 0 month_truck_cnt,\n" + + " 0 day_total_weight,\n" + + " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) day_total_price,\n" + + " 0 day_truck_cnt\n" + " from presell_order p\n" + " where p.del = 0\n" + " ) g"; - Record ret = new Record(); - Record ocout = Db.findFirst(sql_ordercluster, day, day, day, OrderStateEnum.RECEIVED.getStateid()); - Record presell = Db.findFirst(sql_ordercluster_presell, year, year, year, month, month, month, year, month); - ret.setColumns(ocout).setColumns(presell); - - out.set("ordercluster", ret); + Record ocout = Db.findFirst(sql_ordercluster, year, year, year, month, month, month, day, day, day, year, month, day); + out.set("ordercluster", ocout); return out; }