From 3052061eb96de3f531a90ef9f9b1d3669d9b7321 Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Mon, 14 Feb 2022 15:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E8=A1=A8=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E8=A1=8C=E5=8F=8A=E8=A7=A3=E5=86=B3=E5=BA=8F=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 245d3a6..3bac775 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 @@ -2079,6 +2079,9 @@ public class OrderStatService { public Workbook trafficStatisticsOfEachSandStationExport(String stm, String etm, String tm, Integer invoice_type, Integer sale_type) { Record data = trafficStatisticsOfEachSandStation(stm, etm, tm, invoice_type, sale_type); List list = data.get("data"); + List hj_children = new ArrayList<>(); + hj_children.add(list.get(list.size() - 1).set("customer_type_name", "合计")); + list.get(list.size() - 1).set("children", hj_children); List sups = data.get("supermarket"); Workbook wb = new XSSFWorkbook(); @@ -2134,7 +2137,7 @@ public class OrderStatService { row = sheet.createRow(rowcnt++); List children = sales.get("children"); - row.createCell(0).setCellValue(1); + row.createCell(0).setCellValue(i + 1); row.createCell(1).setCellValue(sales.getStr("customer_type_name")); if (children == null) { @@ -2149,7 +2152,7 @@ public class OrderStatService { Record record = children.get(c); a = 0; - row.createCell(a++).setCellValue(c + 1); + row.createCell(a++).setCellValue(i + 1); row.createCell(a++).setCellValue(record.getStr("customer_type_name")); row.createCell(a++).setCellValue(record.getStr("customer_name")); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "prepay_total_amount")); @@ -2165,6 +2168,7 @@ public class OrderStatService { } if (startrow + children.size() - 1 > startrow) { + sheet.addMergedRegion(new CellRangeAddress(startrow, startrow + children.size() - 1, 0, 0)); sheet.addMergedRegion(new CellRangeAddress(startrow, startrow + children.size() - 1, 1, 1)); } }