From cc5e52929b62c0fbe6eb3e67329ba3979068388c Mon Sep 17 00:00:00 2001 From: xiaocui <1334950895@qq.com> Date: Tue, 30 Mar 2021 21:59:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/ssjygl/stat/sale/OrderStatService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 34d123d..1576ba6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -1991,7 +1991,7 @@ public class OrderStatService { "FROM\n" + "(\n" + "SELECT\n" + - "t.customer_id,\n" + + "t.sn,t.customer_id,\n" + "t.customer_name,\n" + "t.weight,\n" + "t.total_price,\n" + @@ -2005,7 +2005,7 @@ public class OrderStatService { "AND t.create_time <=? \n" + "AND t.isprepaid = 1 UNION\n" + "SELECT\n" + - "t.customer_id,\n" + + "t.sn,t.customer_id,\n" + "t.customer_name,\n" + "t.weight,\n" + "t.total_price,\n" + @@ -2068,7 +2068,7 @@ public class OrderStatService { "FROM\n" + "(\n" + "SELECT\n" + - "t.supermarket_id AS id,\n" + + "t.sn,t.supermarket_id AS id,\n" + "t.customer_id,\n" + "t.customer_name,\n" + "t.weight,\n" + @@ -2083,7 +2083,7 @@ public class OrderStatService { "AND t.create_time <=? \n" + "AND t.isprepaid = 1 UNION\n" + "SELECT\n" + - "t.supermarket_id AS id,\n" + + "t.sn,t.supermarket_id AS id,\n" + "t.customer_id,\n" + "t.customer_name,\n" + "t.weight,\n" + @@ -2120,7 +2120,7 @@ public class OrderStatService { "FROM\n" + "(\n" + "SELECT\n" + - "t.weight,\n" + + "t.sn,t.weight,\n" + "t.total_price,\n" + "t.product_id\n" + "FROM\n" + @@ -2131,7 +2131,7 @@ public class OrderStatService { "AND t.create_time <=?\n" + "AND t.isprepaid = 0 UNION\n" + "SELECT\n" + - "t.weight,\n" + + "t.sn,t.weight,\n" + "t.total_price,\n" + "t.product_id\n" + "FROM\n" + @@ -2177,7 +2177,7 @@ public class OrderStatService { "( SELECT id, NAME FROM supermarket ) m join \n" + "(\n" + "SELECT\n" + - "t.supermarket_id AS id,\n" + + "t.sn,t.supermarket_id AS id,\n" + "t.weight,\n" + "t.total_price FROM\n" + "order_sale t \n" + @@ -2187,7 +2187,7 @@ public class OrderStatService { "AND t.create_time <=? \n" + "AND t.isprepaid = 0 UNION\n" + "SELECT\n" + - "t.supermarket_id AS id,\n" + + "t.sn,t.supermarket_id AS id,\n" + "t.weight,\n" + "t.total_price\n" + "FROM\n" + From 44f18adfd73358816add3030530951f8d9cb2db0 Mon Sep 17 00:00:00 2001 From: xiaocui <1334950895@qq.com> Date: Wed, 7 Apr 2021 09:08:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 1576ba6..baff025 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -1843,7 +1843,7 @@ public class OrderStatService { List list=trafficStatisticsOfEachSandStation(stm, etm); Workbook wb = new XSSFWorkbook(); - Sheet sheet = wb.createSheet(stm + " ~ " + etm + "各砂站运输量统计表"); + Sheet sheet = wb.createSheet(stm.substring(0, 10) + " ~ " + etm.substring(0, 10) + "各砂站运输量统计表"); sheet.setColumnWidth(1,40*256); for(int i=2;i<28;i++){