From 1ef275124e5c311daf06b84e961c62e43b748778 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 21 五月 2024 11:41:07 +0800
Subject: [PATCH] 后端获取报表数据

---
 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 cecc4a4..d3d9989 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
@@ -17,6 +17,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +34,7 @@
 
     @ApiOperation("璁㈠崟淇濆瓨")
     @PostMapping("/saveOrder")
+    @SaCheckPermission("createOrder.add")
     public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
         if(orderService.saveOrder(orderMap))    {
             return Result.seccess(true);
@@ -47,45 +49,53 @@
         return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
     }
     @ApiOperation("鍒犻櫎璁㈠崟")
+    @SaCheckPermission("selectOrder.delete")
     @PostMapping("/deleteOrder/{id}")
     public Result deleteOrder(@PathVariable String id)  {
         return Result.seccess(orderService.deleteOrder(id));
     }
 
     @ApiOperation("璁㈠崟浣滃簾")
+    @SaCheckPermission("createOrder.cancel")
     @PostMapping("/cancelOrder/{id}")
     public Result cancelOrder(@PathVariable String id)  {
         return Result.seccess(orderService.cancelOrder(id));
     }
 
     @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
+    @SaCheckPermission("selectOrder.edit")
     @PostMapping("/getOrderById/{id}")
     public Result getOrderById(@PathVariable String id)  {
         return  Result.seccess(orderService.getOrderById(id));
     }
     @ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
+    @SaCheckPermission("updateOrderCraft.search")
     @PostMapping("/getOrderCraftById/{id}")
     public Result getOrderCraftById(@PathVariable String id)  {
         return  Result.seccess(orderService.getOrderCraftById(id));
     }
     @ApiOperation("瀹℃牳璁㈠崟")
+    @SaCheckPermission("createOrder.review")
     @PostMapping("/reviewOrderById/{id}/{status}")
     public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status)  {
         return  Result.seccess(orderService.reviewOrderById(id,status));
     }
 
     @ApiOperation("瀹℃牳宸ヨ壓")
+    @SaCheckPermission("updateOrderCraft.review")
     @PostMapping("/reviewProcessById/{id}/{status}")
     public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails)  {
         return  Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
     }
 
     @ApiOperation("鏇存柊璁㈠崟閲戦鍗曚环")
+    @SaCheckPermission("createOrder.amountReset")
     @PostMapping("/updateOrderMoney")
     public Result updateOrderMoney(@RequestBody Map<String,Object> map)  {
         return  Result.seccess(orderService.updateOrderMoney(map));
     }
 
+    @SaCheckPermission("orderReport.search")
     @ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
     @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
     public Result getOrderReport(@PathVariable Integer pageNum,
@@ -95,9 +105,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,Order.class, orderService.exportOrderReport(dates),"orderReport");
     }
 }

--
Gitblit v1.8.0