From 44ee58a99afe19ba5ae962200f2bebab8da4618b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 07 五月 2024 15:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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 5dc7b7e..a65b541 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
@@ -1,16 +1,21 @@
package com.example.erp.controller.sd;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
+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;
+import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -36,15 +41,24 @@
}
}
@ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
+ @SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order) {
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("璁㈠崟浣滃簾")
+ @PostMapping("/cancelOrder/{id}")
+ public Result cancelOrder(@PathVariable String id) {
+ return Result.seccess(orderService.cancelOrder(id));
+ }
+
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
@@ -72,4 +86,19 @@
public Result updateOrderMoney(@RequestBody Map<String,Object> map) {
return Result.seccess(orderService.updateOrderMoney(map));
}
+
+ @ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
+ @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody OrderDetail orderDetail) {
+ return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
+
+ }
+ @ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
+ @PostMapping("/exportOrderReport")
+ public void exportOrderReport(HttpServletResponse response) throws IOException, IllegalAccessException, InstantiationException {
+ DownExcel.download(response,Order.class, orderService.exportOrderReport(),"orderReport");
+ }
}
--
Gitblit v1.8.0