From 60da5bb6db72be7d2ec74c97ea5ecd8291d6ec5d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 十一月 2022 15:28:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 90 ++++++++++++++++----------------------------
1 files changed, 33 insertions(+), 57 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 45603f1..5fa5d2a 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -7,11 +7,11 @@
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;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.controller.result.CstmrFollowerTableVo;
+import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
@@ -19,6 +19,7 @@
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
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.DicService;
import com.zy.crm.system.service.UserService;
@@ -56,48 +57,19 @@
return R.ok(cstmrService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/cstmr/list/auth")
+ @RequestMapping(value = "/cstmr/page/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- hostEq(wrapper);
- allLike(Cstmr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
- }
- if (!Cools.isEmpty(param.get("dept_id"))) {
- return R.ok(cstmrService.getPage(new Page<>(curr, limit)
- , getHostId()
- , String.valueOf(param.get("dept_id"))
- , condition)
- );
- } else {
- if (Cools.isEmpty(param.get("user_id"))) {
- wrapper.andNew();
- wrapper.eq("user_id", getUserId());
- }
- return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
- }
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
+ public R page(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @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)
+ , getHostId()
+ , deptId == null ? null : String.valueOf(deptId)
+ , userId == null ? getUserId() : userId
+ , condition)
+ );
}
@RequestMapping(value = "/cstmr/add/auth")
@@ -140,17 +112,6 @@
cstmrService.deleteById(id);
}
return R.ok();
- }
-
- @RequestMapping(value = "/cstmr/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("cstmr"));
- convert(map, wrapper);
- List<Cstmr> list = cstmrService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/cstmrQuery/auth")
@@ -306,11 +267,11 @@
@RequestMapping(value = "/cstmr/followers/table/auth")
@ManagerAuth
public R cstmrFollowersTable(@RequestParam("cstmrId") Long cstmrId) {
- List<CstmrFoll> cstmrFolls = cstmrFollService.selectList(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId));
- List<CstmrFollowerTableVo> result = new ArrayList<>();
+ List<CstmrFoll> cstmrFolls = cstmrFollService.selectList(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId).orderBy("id", false));
+ List<FollowerTableVo> result = new ArrayList<>();
for (CstmrFoll cstmrFoll : cstmrFolls) {
User user = userService.selectById(cstmrFoll.getUserId());
- CstmrFollowerTableVo vo = new CstmrFollowerTableVo();
+ FollowerTableVo vo = new FollowerTableVo();
vo.setUserId(user.getId());
vo.setUserName(user.getNickname());
result.add(vo);
@@ -352,4 +313,19 @@
return R.ok("鍒犻櫎鎴愬姛");
}
+ @RequestMapping("/cstmr/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ User user = getUser(); assert user != null;
+ Role role = getRole(); assert role != null;
+ Page<Cstmr> page = cstmrService.getPage(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);
+ }
+
}
--
Gitblit v1.9.1