From d20289401001352bb20ca0bd614f4ef3e2c749d0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 06 八月 2024 17:43:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 996bb83..9e0475e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -151,6 +151,18 @@
return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
}
+
+ @SaCheckPermission("orderReport.search")
+ @ApiOperation("鏌ヨ璁㈠崟鎬绘姤琛�")
+ @PostMapping("/getOrderSummaryReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderSummaryReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody Order order) {
+ return Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
+
+ }
+
@ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
@PostMapping("/exportOrderReport")
public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -166,6 +178,14 @@
DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
}
+ @ApiOperation("璁㈠崟鎬绘姤琛ㄥ鍑�")
+ @PostMapping("/exportOrderSummary")
+ public void exportOrderSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, Order.class, orderService.exportOrderSummary(dates),"orderReport");
+ }
+
@ApiOperation("璁㈠崟灏忕墖鏍囩")
@PostMapping("/getOrderProductDetailTag/{orderId}")
--
Gitblit v1.8.0