From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 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 4df00c7..ebb3696 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,17 +3,25 @@
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;
@RestController
@RequestMapping("/order")
+@Api(value="璁㈠崟controller",tags={"璁㈠崟鎿嶄綔鎺ュ彛"})
public class OrderController {
private final OrderService orderService;
@@ -22,6 +30,7 @@
}
+ @ApiOperation("璁㈠崟淇濆瓨")
@PostMapping("/saveOrder")
public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrder(orderMap)) {
@@ -30,9 +39,63 @@
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
}
-
+ @ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
- public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<LocalDate> selectDate, @RequestBody Order order) {
+ 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("鍒犻櫎璁㈠崟")
+ @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) {
+ return Result.seccess(orderService.getOrderById(id));
+ }
+ @ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
+ @PostMapping("/getOrderCraftById/{id}")
+ public Result getOrderCraftById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftById(id));
+ }
+ @ApiOperation("瀹℃牳璁㈠崟")
+ @PostMapping("/reviewOrderById/{id}/{status}")
+ public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
+ return Result.seccess(orderService.reviewOrderById(id,status));
+ }
+
+ @ApiOperation("瀹℃牳宸ヨ壓")
+ @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("鏇存柊璁㈠崟閲戦鍗曚环")
+ @PostMapping("/updateOrderMoney")
+ 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