From 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期六, 11 五月 2024 08:34:24 +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 | 11 +++++++++++
1 files changed, 11 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 ebb3696..909d354 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,5 +1,6 @@
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;
@@ -32,6 +33,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);
@@ -40,50 +42,59 @@
}
}
@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("璁㈠崟浣滃簾")
+ @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,
--
Gitblit v1.8.0