From 133307a0637193ca0c23f468aea2bd91c76e710a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 14:04:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 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 995f0d7..eea9d9d 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -7,6 +7,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
@@ -18,9 +19,12 @@
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.utils.CompanySearchUtils;
+import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.DicService;
import com.zy.crm.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
@@ -51,6 +55,8 @@
private CstmrTypeService cstmrTypeService;
@Autowired
private DicService dicService;
+ @Autowired
+ private DeptService deptService;
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
@@ -62,19 +68,48 @@
@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 = "user_id") Long userId){
- return R.ok(cstmrService.getPage(new Page<>(curr, limit)
+ 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":
+ try {
+ condition=userService.selectOne(new EntityWrapper<User>().eq("username", condition)).getId().toString();
+ }catch (Exception e){
+ conditionName = null;
+ }
+ break;
+ default:
+
+ }
+ }
+ return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
+ , 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) {
@@ -95,7 +130,7 @@
}
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
@@ -107,13 +142,21 @@
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ for (Long id : ids){
cstmrService.deleteById(id);
}
return R.ok();
}
+
+ @RequestMapping(value = "/cstmr/delete/one/{id}")
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ public R deleteOne(@PathVariable Long id) {
+ cstmrService.deleteById(id);
+ return R.ok();
+ }
+
@RequestMapping(value = "/cstmrQuery/auth")
@ManagerAuth
@@ -129,6 +172,13 @@
result.add(map);
}
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")
@@ -306,13 +356,14 @@
@ManagerAuth
@Transactional
public R cstmrFollowersAddJson(@RequestBody() Map map) {
- Object cstmrId = map.get("cstmrId");
- Object followerIds = map.get("followerIds");
- long cstmrId1 = Long.valueOf(String.valueOf(cstmrId));
- long followerIds1 = Long.valueOf(String.valueOf(followerIds));
+ long cstmrId = Long.valueOf(String.valueOf(map.get("cstmrId")));
+ long followerIds = Long.valueOf(String.valueOf(map.get("followerIds")));
+ if (Cools.isEmpty(cstmrId, followerIds)) {
+ return R.parse(BaseRes.PARAM);
+ }
CstmrFoll cstmrFoll = new CstmrFoll();
- cstmrFoll.setCstmrId(cstmrId1);
- cstmrFoll.setUserId(followerIds1);
+ cstmrFoll.setCstmrId(cstmrId);
+ cstmrFoll.setUserId(followerIds);
if (!cstmrFollService.insert(cstmrFoll)) {
throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1