From 63b3aa02ab6eba9471fa3305ea1a979d97189932 Mon Sep 17 00:00:00 2001 From: xiaocui <1334950895@qq.com> Date: Thu, 15 Apr 2021 11:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/service/ssjygl/prepay/PrepayController.java | 6 ++++-- .../cowr/service/ssjygl/stat/sale/OrderStatController.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java index 15c8731..fff1d20 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java @@ -52,14 +52,16 @@ public class PrepayController extends BaseController { } Integer supermarket_id = getInt("supermarket_id"); + Integer invoice_type = getInt("invoice_type"); + String stm = get("stm"); String etm = get("etm"); String truck_license = get("truck_license"); if (export == 0) { - renderJson(Result.success(PrepayService.me.consumption(customer_id, supermarket_id, stm, etm, truck_license))); + renderJson(Result.success(PrepayService.me.consumption(customer_id, supermarket_id, stm, etm, truck_license,invoice_type))); } else { - Workbook wb = PrepayService.me.consumptionExport(customer_id, supermarket_id, stm, etm, truck_license); + Workbook wb = PrepayService.me.consumptionExport(customer_id, supermarket_id, stm, etm, truck_license,invoice_type); render(new ExcelRender("消费记录_" + System.currentTimeMillis() + ".xlsx", wb)); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java index 5fc837a..f01a329 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java @@ -401,11 +401,12 @@ public class OrderStatController extends BaseController { public void trafficStatisticsOfEachSandStation(){ String stm=get("stm"); String etm=get("etm"); + Integer invoice_type=getInt("invoice_type"); int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 if (export == 0) { - renderJson(Result.object(OrderStatService.me.trafficStatisticsOfEachSandStation(stm, etm))); + renderJson(Result.object(OrderStatService.me.trafficStatisticsOfEachSandStation(stm, etm,invoice_type))); }else { - Workbook wb = OrderStatService.me.trafficStatisticsOfEachSandStationExport(stm, etm); + Workbook wb = OrderStatService.me.trafficStatisticsOfEachSandStationExport(stm, etm,invoice_type); render(new ExcelRender("各砂站运输量统计表_" + System.currentTimeMillis() + ".xlsx", wb)); } }