From 0ed8d9ed041efec0b726a33be20d879c9457e319 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 06 六月 2024 09:39:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
index 1f41cbf..0a34bcd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -1,6 +1,7 @@
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.Customer;
@@ -28,35 +29,31 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@ApiOperation("瀹㈡埛鏌ヨ鎺ュ彛")
- @PostMapping("/getseletCustomer/{pageNum}/{pageSize}")
- public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
- return Result.seccess(customerService.getseletCustomer(pageNum,pageSize,customer));
+ @SaCheckPermission("selectCustomer.search")
+ @PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
+ public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
+ return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
}
@ApiOperation("瀹㈡埛鏂板淇敼鎺ュ彛")
+ @SaCheckPermission("CreateCustomer.add")
@PostMapping("/insertCustomer")
public Result insertCustomer( @RequestBody Map<String,Object> object){
- if(customerService.insertCustomer(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹㈡埛鏂板/淇敼澶辫触");
-
- }
+ return Result.seccess(customerService.insertCustomer(object));
}
@ApiOperation("瀹㈡埛鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectCustomer.delete")
@PostMapping("/deleteCustomer")
public Result deleteCustomer( @RequestBody Map<String,Object> object){
- if(customerService.deleteCustomer(object)){
+ return Result.seccess(customerService.deleteCustomer(object));
+ }
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹㈡埛鍒犻櫎澶辫触");
-
- }
+ @ApiOperation("瀹㈡埛璁㈠崟鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectCustomerOrder.search")
+ @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
}
--
Gitblit v1.8.0