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 f3a0e50..95507b1 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 @@ -2015,10 +2015,10 @@ public class OrderStatService { } public Workbook trafficStatisticsOfEachSandStationExport(String stm, String etm, String tm, Integer invoice_type) { - Record data = trafficStatisticsOfEachSandStation(stm, etm, tm, invoice_type); - List list = data.get("data"); + Record data = trafficStatisticsOfEachSandStation(stm, etm, tm, invoice_type); + List list = data.get("data"); List sups = data.get("supermarket"); - Workbook wb = new XSSFWorkbook(); + Workbook wb = new XSSFWorkbook(); Sheet sheet = wb.createSheet(stm.substring(0, 10) + " ~ " + etm.substring(0, 10) + "各砂站运输量统计表"); @@ -2039,8 +2039,8 @@ public class OrderStatService { Row row3 = sheet.createRow(2); int a2 = 8; - for (int i=0; i typelist = Db.find("select id customer_type_id, name customer_type_name, name from customer_type"); + double all_prepay_total_amount = 0.0; + double all_refund_total_amount = 0.0; + double all_prepay_surplus = 0.0; + double all_weight = 0.0; + double all_total_price = 0.0; + double all_xsl_1 = 0.0; + double all_xsl_2 = 0.0; + double all_xsl_3 = 0.0; + double all_xsl_4 = 0.0; + double all_xsl_5 = 0.0; + double all_xsl_6 = 0.0; + double all_xse_1 = 0.0; + double all_xse_2 = 0.0; + double all_xse_3 = 0.0; + double all_xse_4 = 0.0; + double all_xse_5 = 0.0; + double all_xse_6 = 0.0; + for (Record record : typelist) { Integer customer_type_id = record.getInt("customer_type_id"); @@ -2325,6 +2343,24 @@ public class OrderStatService { xse_4 += DataUtil.getDefaultByRecord(r, "xse_4"); xse_5 += DataUtil.getDefaultByRecord(r, "xse_5"); xse_6 += DataUtil.getDefaultByRecord(r, "xse_6"); + + all_prepay_total_amount += DataUtil.getDefaultByRecord(r, "prepay_total_amount"); + all_refund_total_amount += DataUtil.getDefaultByRecord(r, "refund_total_amount"); + all_prepay_surplus += DataUtil.getDefaultByRecord(r, "prepay_surplus"); + all_weight += DataUtil.getDefaultByRecord(r, "weight"); + all_total_price += DataUtil.getDefaultByRecord(r, "total_price"); + all_xsl_1 += DataUtil.getDefaultByRecord(r, "xsl_1"); + all_xsl_2 += DataUtil.getDefaultByRecord(r, "xsl_2"); + all_xsl_3 += DataUtil.getDefaultByRecord(r, "xsl_3"); + all_xsl_4 += DataUtil.getDefaultByRecord(r, "xsl_4"); + all_xsl_5 += DataUtil.getDefaultByRecord(r, "xsl_5"); + all_xsl_6 += DataUtil.getDefaultByRecord(r, "xsl_6"); + all_xse_1 += DataUtil.getDefaultByRecord(r, "xse_1"); + all_xse_2 += DataUtil.getDefaultByRecord(r, "xse_2"); + all_xse_3 += DataUtil.getDefaultByRecord(r, "xse_3"); + all_xse_4 += DataUtil.getDefaultByRecord(r, "xse_4"); + all_xse_5 += DataUtil.getDefaultByRecord(r, "xse_5"); + all_xse_6 += DataUtil.getDefaultByRecord(r, "xse_6"); } record.set("prepay_total_amount", prepay_total_amount); @@ -2358,6 +2394,30 @@ public class OrderStatService { } }); + Record record = new Record(); + + record.set("customer_type_id", -1); + record.set("name", "合计"); + record.set("prepay_total_amount", all_prepay_total_amount); + record.set("refund_total_amount", all_refund_total_amount); + record.set("prepay_surplus", all_prepay_surplus); + record.set("weight", all_weight); + record.set("total_price", all_total_price); + record.set("xsl_1", all_xsl_1); + record.set("xsl_2", all_xsl_2); + record.set("xsl_3", all_xsl_3); + record.set("xsl_4", all_xsl_4); + record.set("xsl_5", all_xsl_5); + record.set("xsl_6", all_xsl_6); + record.set("xse_1", all_xse_1); + record.set("xse_2", all_xse_2); + record.set("xse_3", all_xse_3); + record.set("xse_4", all_xse_4); + record.set("xse_5", all_xse_5); + record.set("xse_6", all_xse_6); + + typelist.add(record); + return new Record().set("data", typelist).set("supermarket", sups); }