From bb5fdf25165a10e636fd61180243d048926fe9df Mon Sep 17 00:00:00 2001
From: 邓实川 <544939826@qq.com>
Date: Fri, 12 Jun 2020 08:58:48 +0800
Subject: [PATCH] 新增联系人优化
---
src/main/java/cn/timer/api/controller/crm/CrmController.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/crm/CrmController.java b/src/main/java/cn/timer/api/controller/crm/CrmController.java
index 3b3c2e8..5708341 100644
--- a/src/main/java/cn/timer/api/controller/crm/CrmController.java
+++ b/src/main/java/cn/timer/api/controller/crm/CrmController.java
@@ -428,8 +428,8 @@ public class CrmController {
.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like));
- if (crmClientData != null)
- myCrmClientAssociates.add(crmClientData);
+ if (crmClientData != null)
+ myCrmClientAssociates.add(crmClientData);
}
return myCrmClientAssociates;
}
@@ -468,7 +468,7 @@ public class CrmController {
if (type == null || type == 0) { // 全部客户(去重)
List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like);
List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
- crmClientDatas = CheckUtil.distinct(myClient, myAsso, true);
+ crmClientDatas = CheckUtil.distinct(myClient, myAsso, true);
} else if (type == 1) // 我负责的客户
crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like);
else if (type == 2) // 我协作的客户
@@ -479,11 +479,10 @@ public class CrmController {
crmClientDatas = getCilentFollowOvertime(empNum, orgCode, groupId, status);
else
return ResultUtil.error("查询失败");
- // TODO 排序
Collections.sort(crmClientDatas, Comparator.comparing(CrmClientData::getCreateTime).reversed()); // 按时间降序排序
return ResultUtil.data(crmClientDatas, "查询成功");
}
-
+
private List<Integer> MyJoinGroup(Integer empNum, Integer orgCode) {
List<CrmBusinessGroupMember> members = CrmBusinessGroupMember.builder().build()
.selectList(new QueryWrapper<CrmBusinessGroupMember>().lambda()
@@ -562,9 +561,10 @@ public class CrmController {
@PostMapping("addCilentLinkMan")
@Transactional
@ApiOperation(value = "新增/编辑客户联系人", httpMethod = "POST", notes = "接口发布说明")
- public Result<Void> addCilentLinkMan(@CurrentUser UserBean userBean, CrmClientContacts crmClientContacts) {
+ public Result<Void> addCilentLinkMan(@CurrentUser UserBean userBean,
+ @RequestBody CrmClientContacts crmClientContacts) {
if (crmClientContacts.getId() == null) {
- Integer num = CrmClientData.builder().build().selectById().getContactsNum();
+ Integer num = CrmClientData.builder().id(crmClientContacts.getCid()).build().selectById().getContactsNum();
CrmClientData.builder().id(crmClientContacts.getCid()).contactsNum(++num).build().updateById();
}
if (crmClientContacts.insertOrUpdate())
--
libgit2 0.26.0