xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

砂站运输量统计添加发票类型统计

dev
xiaocui 2021-04-15 11:49:51 +08:00
parent 9db3b60473
commit 63b3aa02ab
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java
View File

@ -52,14 +52,16 @@ public class PrepayController extends BaseController {
} }
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
Integer invoice_type = getInt("invoice_type");
String stm = get("stm"); String stm = get("stm");
String etm = get("etm"); String etm = get("etm");
String truck_license = get("truck_license"); String truck_license = get("truck_license");
if (export == 0) { 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 { } 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)); render(new ExcelRender("消费记录_" + System.currentTimeMillis() + ".xlsx", wb));
} }
} }

5
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java
View File

@ -401,11 +401,12 @@ public class OrderStatController extends BaseController {
public void trafficStatisticsOfEachSandStation(){ public void trafficStatisticsOfEachSandStation(){
String stm=get("stm"); String stm=get("stm");
String etm=get("etm"); String etm=get("etm");
Integer invoice_type=getInt("invoice_type");
int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出
if (export == 0) { if (export == 0) {
renderJson(Result.object(OrderStatService.me.trafficStatisticsOfEachSandStation(stm, etm))); renderJson(Result.object(OrderStatService.me.trafficStatisticsOfEachSandStation(stm, etm,invoice_type)));
}else { }else {
Workbook wb = OrderStatService.me.trafficStatisticsOfEachSandStationExport(stm, etm); Workbook wb = OrderStatService.me.trafficStatisticsOfEachSandStationExport(stm, etm,invoice_type);
render(new ExcelRender("各砂站运输量统计表_" + System.currentTimeMillis() + ".xlsx", wb)); render(new ExcelRender("各砂站运输量统计表_" + System.currentTimeMillis() + ".xlsx", wb));
} }
} }