From 149d60a12ef635c2b08e4ebedfc9afa7363a6562 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 20 二月 2024 16:16:25 +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 | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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..3792c04 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
@@ -32,7 +32,32 @@
}
@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));
}
+
+ @PostMapping("/deleteOrder/{id}")
+ public Result deleteOrder(@PathVariable String id) {
+ return Result.seccess(orderService.deleteOrder(id));
+ }
+
+ @PostMapping("/getOrderById/{id}")
+ public Result getOrderById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderById(id));
+ }
+ @PostMapping("/getOrderCraftById/{id}")
+ public Result getOrderCraftById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftById(id));
+ }
+
+ @PostMapping("/reviewOrderById/{id}/{status}")
+ public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
+ return Result.seccess(orderService.reviewOrderById(id,status));
+ }
+
+
+ @PostMapping("/reviewProcessById/{id}/{status}")
+ public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status) {
+ return Result.seccess(orderService.reviewProcessById(id,status));
+ }
}
--
Gitblit v1.8.0