From f40a9f9c1b90d3efd52926b29f3612cb1c293afa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 13:25:42 +0800
Subject: [PATCH] #跟踪项目负责人默认值
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index b502936..75ffe4d 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -16,9 +16,12 @@
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
+import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.utils.CompanySearchUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
@@ -56,6 +59,8 @@
private DicService dicService;
@Autowired
private DeptService deptService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
@@ -67,11 +72,23 @@
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String followerName,
@RequestParam(required = false) String conditionName,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
- @RequestParam(required = false, value = "role_id") Long roleId,
@RequestParam(required = false, value = "user_id") Long userId){
+ List<Integer> ids = new ArrayList<>();
+ if (!Cools.isEmpty(followerName)){
+ User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
+ if (!Cools.isEmpty(username)){
+ List<CstmrFoll> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
+ for (CstmrFoll id : cstmrIds){
+ ids.add(id.getCstmrId().intValue());
+ }
+ }else {
+ return R.error("鏈煡璇㈠埌璺熻繘浜轰俊鎭紒");
+ }
+ }
if (!Cools.isEmpty(conditionName)){
switch (conditionName){
case "director":
@@ -85,22 +102,26 @@
}
}
- return R.ok(cstmrService.getPage2(new Page<>(curr, limit)
+ return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? userService.selectById(getUserId()).getDeptId() : deptId
+ , deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
- , roleId == null ? userService.selectById(getUserId()).getRoleId() : roleId
+ , Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
);
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅")
public R add(Cstmr cstmr) {
Long hostId = getHostId();
if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ Cstmr cstmr1 = cstmrService.selectByName(hostId, cstmr.getName());
+ if (cstmr1!=null){
+ throw new CoolException("璇ュ鎴蜂俊鎭凡瀛樺湪锛屼笟鍔″憳鏄�:"+cstmr1.getDirector$());
}
cstmr.setHostId(hostId);
cstmr.setUuid(cstmrService.getUuid(hostId)); // 瀹㈡埛浠ｅ彿
@@ -117,7 +138,7 @@
}
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
@@ -129,14 +150,28 @@
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
+ int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
+ if (cstmr_id!=0){
+ return R.error("瀛樺湪鍏宠仈璺熻釜椤圭洰锛岀姝㈠垹闄わ紒锛侊紒");
+ }
cstmrService.deleteById(id);
}
return R.ok();
}
+ @RequestMapping(value = "/cstmr/delete/one/{id}")
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ public R deleteOne(@PathVariable Long id) {
+ int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
+ if (cstmr_id!=0){
+ return R.error("瀛樺湪鍏宠仈璺熻釜椤圭洰锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ cstmrService.deleteById(id);
+ return R.ok();
+ }
@RequestMapping(value = "/cstmrQuery/auth")
@@ -155,6 +190,13 @@
return R.ok(result);
}
+ @RequestMapping(value = "/cstmrSearch/auth")
+ @ManagerAuth
+ public R cstmrSearch(String condition) {
+ List<Map<String, Object>> search = CompanySearchUtils.search(condition, 1);
+ return R.ok(search);
+ }
+
@RequestMapping(value = "/cstmr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
--
Gitblit v1.9.1