Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!454

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -503,12 +503,16 @@ public class CrmController {
 
 
 	// 归属我的客户
 	// 归属我的客户
 	private List<CrmClientData> getMyCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
 	private List<CrmClientData> getMyCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
-			String like) {
+			String like,String startCreateTime,  String endCreateTime,  String startFollowTime, String endFollowTime) {
 		return CrmClientData.builder().build()
 		return CrmClientData.builder().build()
 				.selectList(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
 				.selectList(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
 						.eq(CrmClientData::getBelongUser, empNum)
 						.eq(CrmClientData::getBelongUser, empNum)
 						.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
 						.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
 						.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
 						.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
+						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
+						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
+						.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
+						.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime)
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 						.orderByDesc(CrmClientData::getCreateTime));
 						.orderByDesc(CrmClientData::getCreateTime));
@@ -538,7 +542,7 @@ public class CrmController {
 	// 我的全部客户
 	// 我的全部客户
 	private List<CrmClientData> getMyTotalCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
 	private List<CrmClientData> getMyTotalCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
 			String like) {
 			String like) {
-		return CheckUtil.distinct(getMyCilent(empNum, orgCode, groupId, status, like),
+		return CheckUtil.distinct(getMyCilent(empNum, orgCode, groupId, status, like,null,null,null,null),
 				getMyAssociateCilent(empNum, orgCode, groupId, status, like), true);
 				getMyAssociateCilent(empNum, orgCode, groupId, status, like), true);
 	}
 	}
 
 
@@ -570,17 +574,21 @@ public class CrmController {
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer status,
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer status,
 			@RequestParam(required = false) String like,
 			@RequestParam(required = false) String like,
 			@RequestParam(required = false, defaultValue = "1") int pageNumber,
 			@RequestParam(required = false, defaultValue = "1") int pageNumber,
-			@RequestParam(required = false, defaultValue = "10") int pageSize) {
+			@RequestParam(required = false, defaultValue = "10") int pageSize,
+			@RequestParam(required = false) String startCreateTime,
+			@RequestParam(required = false) String endCreateTime,
+			@RequestParam(required = false) String startFollowTime,
+			@RequestParam(required = false) String endFollowTime) {
 		Integer empNum = getEmpNum(userBean);
 		Integer empNum = getEmpNum(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		List<CrmClientData> crmClientDatas = null;
 		List<CrmClientData> crmClientDatas = null;
 		if (type == null || type == 0) { // 全部客户(去重)
 		if (type == null || type == 0) { // 全部客户(去重)
-			List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like);
+			List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime);
 			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
 			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
 			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
 			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
 					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 		} else if (type == 1) // 我负责的客户
 		} else if (type == 1) // 我负责的客户
-			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like);
+			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime);
 		else if (type == 2) // 我协作的客户
 		else if (type == 2) // 我协作的客户
 			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
 			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
 		else if (type == 3) // 我关注的客户
 		else if (type == 3) // 我关注的客户