From 6630484f4d595c468dba6b07d4586bfbb16525fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:14:19 +0800
Subject: [PATCH] #合同审核完善
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 96c5bb2..27455e0 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -15,8 +15,10 @@
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.entity.OrderFoll;
+import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.service.OrderFollService;
import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
@@ -40,6 +42,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private PlanService planService;
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
@@ -91,6 +95,13 @@
return R.ok();
}
+ @RequestMapping(value = "/order/userName/userId/auth")
+ @ManagerAuth(memo = "娣诲姞璺熻釜椤圭洰鑾峰彇褰撳墠鐧诲綍璐﹀彿淇℃伅")
+ public R userNameAndUserId() {
+ KeyValueVo keyValueVo = new KeyValueVo(getUser().getNickname(),getUserId());
+ return R.ok().add(keyValueVo);
+ }
+
@RequestMapping(value = "/order/update/auth")
@ManagerAuth(memo = "鏇存柊璺熻釜椤圭洰")
public R update(Order order){
@@ -107,8 +118,12 @@
@ManagerAuth(memo = "鍒犻櫎璺熻釜椤圭洰")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
+ int plan = planService.selectCount(new EntityWrapper<Plan>().eq("order_id", id));
+ if (plan!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勮鍒掑崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
orderService.deleteById(id);
- }
+ }
return R.ok();
}
--
Gitblit v1.9.1