From 809f6b3659afdf5b58bf6a5697ecd25ba4e189d1 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 30 Nov 2020 23:34:14 +0800 Subject: [PATCH] . --- .../ssjygl/stat/sale/OrderStatController.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java index dd7a6d6..c5aa479 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java @@ -116,12 +116,13 @@ public class OrderStatController extends BaseController { */ @Before(DayValidator.class) public void daystatCustomer() { - String tm = get("tm"); - int export = getInt("export", 0); + String tm = get("tm"); + Integer invoice_type = getInt("invoice_type"); + int export = getInt("export", 0); if (export == 0) { - renderJson(Result.object(OrderStatService.me.salestatCustomer(tm))); + renderJson(Result.object(OrderStatService.me.salestatCustomer(tm, invoice_type))); } else { - Workbook wb = OrderStatService.me.daysalestatCustomerExport(tm); + Workbook wb = OrderStatService.me.daysalestatCustomerExport(tm, invoice_type); render(new ExcelRender(tm + "_销售日统计_" + System.currentTimeMillis() + ".xlsx", wb)); } } @@ -131,13 +132,14 @@ public class OrderStatController extends BaseController { */ @Before(MonthValidator.class) public void monthstatCustomer() { - String tm = get("tm"); - int export = getInt("export", 0); + String tm = get("tm"); + Integer invoice_type = getInt("invoice_type"); + int export = getInt("export", 0); if (export == 0) { - renderJson(Result.object(OrderStatService.me.salestatCustomer(tm))); + renderJson(Result.object(OrderStatService.me.salestatCustomer(tm, invoice_type))); } else { - Workbook wb = OrderStatService.me.monthsalestatCustomerExport(tm); + Workbook wb = OrderStatService.me.monthsalestatCustomerExport(tm, invoice_type); render(new ExcelRender(tm + "_销售月统计_" + System.currentTimeMillis() + ".xlsx", wb)); } } @@ -305,8 +307,8 @@ public class OrderStatController extends BaseController { @Before(StartAndEndIntervalValidator.class) public void statRangeAllCustomer() { - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm"); + String etm = get("etm"); int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 if (export == 0) { renderJson(Result.object(OrderStatService.me.yearStatByCustomer(stm, etm))); @@ -318,8 +320,8 @@ public class OrderStatController extends BaseController { @Before(StartAndEndIntervalValidator.class) public void statRangeAllSup() { - String stm = get("stm"); - String etm = get("etm"); + String stm = get("stm"); + String etm = get("etm"); int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 if (export == 0) { renderJson(Result.object(OrderStatService.me.yearStatBySup(stm, etm)));