From 3c92cbb56c7cf52239a77a5563e146c5be78f3a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 15 十一月 2022 15:24:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 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 8382466..09ed9c0 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;
@@ -71,19 +71,6 @@
);
}
- 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);
- }
- }
- }
-
@RequestMapping(value = "/cstmr/add/auth")
@ManagerAuth
public R add(Cstmr cstmr) {
@@ -124,17 +111,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")
@@ -291,10 +267,10 @@
@ManagerAuth
public R cstmrFollowersTable(@RequestParam("cstmrId") Long cstmrId) {
List<CstmrFoll> cstmrFolls = cstmrFollService.selectList(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId).orderBy("id", false));
- List<CstmrFollowerTableVo> result = new ArrayList<>();
+ 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);
@@ -336,4 +312,13 @@
return R.ok("鍒犻櫎鎴愬姛");
}
+ @RequestMapping("/cstmr/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ Wrapper<Cstmr> wrapper = new EntityWrapper<Cstmr>().andNew().like("name", condition).or().like("uuid", condition).orderBy("create_time", false);
+ cstmrService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
+ return R.ok().add(vos);
+ }
+
}
--
Gitblit v1.9.1