From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 195 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 189 insertions(+), 6 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 5c9c60f..554a0c2 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
@@ -63,9 +68,82 @@
return R.ok(cstmrService.selectById(String.valueOf(id)));
}
+ @RequestMapping(value = "/cstmr/name/check/auth")
+ @ManagerAuth
+ public R getName(String name) {
+ Cstmr cstmr = cstmrService.selectByName(getHostId(), name);
+ if (Cools.isEmpty(cstmr) || cstmr==null){
+ return R.ok();
+ }else {
+ return R.error(name+"宸插瓨鍦�");
+ }
+ }
+
@RequestMapping(value = "/cstmr/page/auth")
@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){
+ if (getUser().getRoleId()!=1){
+ if (!getUser().getNickname().equals("闄堢嚂")){
+ return R.ok(new Page<Cstmr>());
+ }
+ }
+ 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:
+
+ }
+ }
+
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+// director = getUserId();
+ }
+
+ return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
+ , getHostId()
+ , deptId == null ? null : String.valueOf(deptId)
+ , userId
+ , director
+ , Cools.isEmpty(followerName) ? null : ids
+ , conditionName
+ , condition)
+ );
+ }
+
+ @RequestMapping(value = "/cstmr2/page/auth")
+ @ManagerAuth
+ public R page2(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String followerName,
@RequestParam(required = false) String conditionName,
@@ -97,10 +175,22 @@
}
}
- return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ director = getUserId();
+ }
+
+ return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
@@ -108,11 +198,23 @@
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
public R add(Cstmr cstmr) {
+ if (getUser().getRoleId()!=1){
+ if (!getUser().getNickname().equals("闄堢嚂")){
+ return R.error("鎮ㄦ病鏈夋坊鍔犳潈闄�");
+ }
+ }
Long hostId = getHostId();
if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ if (cstmrService.selectByName(hostId, cstmr.getName()) != 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)); // 瀹㈡埛浠ｅ彿
@@ -123,35 +225,94 @@
cstmr.setCreateTime(new Date());
cstmr.setUpdateBy(getUserId());
cstmr.setUpdateTime(new Date());
+// cstmr.setDirector(getUserId());
cstmr.setStatus(1);
cstmrService.insert(cstmr);
return R.ok();
}
+ @RequestMapping(value = "/cstmr/add2/auth")
+ @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
+ public R add22(Cstmr cstmr) {
+ Long hostId = getHostId();
+ if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
+ throw new CoolException("瀹㈡埛宸插瓨鍦�");
+ }
+ if (cstmrService.selectByName(hostId, cstmr.getName()) != 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)); // 瀹㈡埛浠ｅ彿
+ cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+
+ cstmr.setCreateBy(getUserId());
+ cstmr.setCreateTime(new Date());
+ cstmr.setUpdateBy(getUserId());
+ cstmr.setUpdateTime(new Date());
+ cstmr.setDirector(getUserId());
+ cstmr.setStatus(1);
+ cstmrService.insert(cstmr);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/cstmr2/add/auth")
+ @ManagerAuth(memo = "鎺ュ彇鐢叉柟鍗曚綅")
+ public R add2(Cstmr cstmr) {
+ Cstmr cstmr1 = cstmrService.selectByName(getHostId(),cstmr.getName());
+ if (Cools.isEmpty(cstmr1) || cstmr1.getDirector()!=null){
+ return R.error("浣犳棤娉曟帴鍙栨鐢叉柟鍗曚綅!");
+ }
+ cstmr1.setDirector(getUserId());
+ cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+ cstmr.setUpdateBy(getUserId());
+ cstmr.setUpdateTime(new Date());
+ cstmrService.updateById(cstmr1);
+ return R.ok();
+ }
+
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
}
cstmr.setUpdateBy(getUserId());
cstmr.setUpdateTime(new Date());
+ if (!Cools.isEmpty(cstmr.getDirector())){
+ User director = userService.selectById(cstmr.getDirector());
+ cstmr.setDeptId(director.getDeptId());
+ cstmr.setUserId(director.getId());
+ }
cstmrService.updateById(cstmr);
return R.ok();
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
+ int order = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
+ if (order!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勮窡韪」鐩紝绂佹鍒犻櫎锛侊紒锛�");
+ }
cstmrService.deleteById(id);
}
return R.ok();
}
@RequestMapping(value = "/cstmr/delete/one/{id}")
- @ManagerAuth
+ @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();
}
@@ -171,6 +332,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")
@@ -390,6 +558,21 @@
return R.ok().add(vos);
}
+ @RequestMapping("/cstmr2/all/get/kv")
+ @ManagerAuth
+ public R getDataKV2(@RequestParam(required = false) String condition) {
+ User user = getUser(); assert user != null;
+ Role role = getRole(); assert role != null;
+ Page<Cstmr> page = cstmrService.getPageCstmr2(new Page<>(1, 30)
+ , getHostId()
+ , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
+ , user.getId()
+ , condition);
+ List<KeyValueVo> vos = new ArrayList<>();
+ page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
+ return R.ok().add(vos);
+ }
+
@RequestMapping("/cstmr/file/import")
@Transactional
public R fileImport() throws IOException {
--
Gitblit v1.9.1