From 3969bf37c5c0d45068abf3400bae67304ea5559c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 22 五月 2024 11:37:13 +0800
Subject: [PATCH] 提交报表导出功能
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 909d354..a5ed56a 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
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -11,7 +12,6 @@
import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -104,9 +104,22 @@
return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
}
+
+ //@SaCheckPermission("orderProductSummary.search")
+ @ApiOperation("鏌ヨ璁㈠崟浜у搧姹囨�绘姤琛�")
+ @PostMapping("/getOrderProductSummary/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderProductSummary(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody OrderDetail orderDetail) {
+ return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
+
+ }
@ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
@PostMapping("/exportOrderReport")
- public void exportOrderReport(HttpServletResponse response) throws IOException, IllegalAccessException, InstantiationException {
- DownExcel.download(response,Order.class, orderService.exportOrderReport(),"orderReport");
+ public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, OrderDTO.class, orderService.exportOrderReport(dates),"orderReport");
}
}
--
Gitblit v1.8.0