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 | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 1209c35..27455e0 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -12,10 +12,13 @@
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
+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;
@@ -39,6 +42,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private PlanService planService;
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
@@ -90,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){
@@ -106,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();
}
@@ -122,6 +138,7 @@
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getId());
+ map.put("name", order.getName());
result.add(map);
}
return R.ok(result);
@@ -172,7 +189,7 @@
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
, condition
- , null);
+ , 0);
List<KeyValueVo> vos = new ArrayList<>();
page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
return R.ok().add(vos);
@@ -264,6 +281,24 @@
return R.ok("娣诲姞鎴愬姛");
}
+ @RequestMapping(value = "/order/followers/add/json")
+ @ManagerAuth
+ @Transactional
+ public R cstmrFollowersAddJson(@RequestBody() Map map) {
+ long cstmrId = Long.valueOf(String.valueOf(map.get("orderId")));
+ long followerIds = Long.valueOf(String.valueOf(map.get("followerIds")));
+ if (Cools.isEmpty(cstmrId, followerIds)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ OrderFoll orderFoll = new OrderFoll();
+ orderFoll.setOrderId(cstmrId);
+ orderFoll.setUserId(followerIds);
+ if (!orderFollService.insert(orderFoll)) {
+ throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
@RequestMapping(value = "/order/followers/remove/auth")
@ManagerAuth
public R orderFollowersRemove(@RequestParam("orderId") Long orderId,
--
Gitblit v1.9.1