From 500828666889e8205f59da07742f54e45cad365c Mon Sep 17 00:00:00 2001 From: xiaocui <1334950895@qq.com> Date: Fri, 16 Apr 2021 10:54:25 +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 +++--- 1 file changed, 3 insertions(+), 3 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..c553c6b 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 @@ -55,11 +55,11 @@ public class PrepayController extends BaseController { String stm = get("stm"); String etm = get("etm"); String truck_license = get("truck_license"); - + Integer invoice_type = getInt("invoice_type"); 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)); } }