|
|
@@ -1,11 +1,11 @@
|
|
|
package cn.iocoder.yudao.module.crm.dal.mysql.customer;
|
|
|
|
|
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
|
|
+import cn.hutool.core.util.ObjUtil;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
|
|
|
-import cn.iocoder.yudao.module.crm.controller.admin.backlog.vo.CrmTodayCustomerPageReqVO;
|
|
|
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerPageReqVO;
|
|
|
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
|
|
|
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerPoolConfigDO;
|
|
|
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
import org.springframework.lang.Nullable;
|
|
|
+import org.springframework.util.Assert;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.Collection;
|
|
|
@@ -58,49 +59,36 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
|
|
|
.eqIfPresent(CrmCustomerDO::getIndustryId, pageReqVO.getIndustryId())
|
|
|
.eqIfPresent(CrmCustomerDO::getLevel, pageReqVO.getLevel())
|
|
|
.eqIfPresent(CrmCustomerDO::getSource, pageReqVO.getSource());
|
|
|
- return selectJoinPage(pageReqVO, CrmCustomerDO.class, query);
|
|
|
- }
|
|
|
-
|
|
|
- default List<CrmCustomerDO> selectBatchIds(Collection<Long> ids, Long userId) {
|
|
|
- MPJLambdaWrapperX<CrmCustomerDO> query = new MPJLambdaWrapperX<>();
|
|
|
- // 拼接数据权限的查询条件
|
|
|
- CrmQueryWrapperUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(), ids, userId);
|
|
|
- // 拼接自身的查询条件
|
|
|
- query.selectAll(CrmCustomerDO.class).in(CrmCustomerDO::getId, ids).orderByDesc(CrmCustomerDO::getId);
|
|
|
- return selectJoinList(CrmCustomerDO.class, query);
|
|
|
- }
|
|
|
|
|
|
- /**
|
|
|
- * 待办事项 - 今日需联系客户
|
|
|
- *
|
|
|
- * @param pageReqVO 分页请求参数
|
|
|
- * @param userId 当前用户ID
|
|
|
- * @return 分页结果
|
|
|
- */
|
|
|
- default PageResult<CrmCustomerDO> selectTodayCustomerPage(CrmTodayCustomerPageReqVO pageReqVO, Long userId) {
|
|
|
- MPJLambdaWrapperX<CrmCustomerDO> query = new MPJLambdaWrapperX<>();
|
|
|
- // 拼接数据权限的查询条件
|
|
|
- CrmQueryWrapperUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
|
|
|
- CrmCustomerDO::getId, userId, pageReqVO.getSceneType(), null);
|
|
|
+ // backlog 查询
|
|
|
+ if (ObjUtil.isNotNull(pageReqVO.getContactStatus())) {
|
|
|
+ Assert.isNull(pageReqVO.getPool(), "[是否为公海数据]必须是null");
|
|
|
|
|
|
- // 拼接自身的查询条件
|
|
|
- query.selectAll(CrmCustomerDO.class);
|
|
|
- if (pageReqVO.getContactStatus() != null) {
|
|
|
LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
|
|
|
LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
|
|
|
- if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_TODAY)) { // 今天需联系
|
|
|
+ if (pageReqVO.getContactStatus().equals(CrmCustomerPageReqVO.CONTACT_TODAY)) { // 今天需联系
|
|
|
query.between(CrmCustomerDO::getContactNextTime, beginOfToday, endOfToday);
|
|
|
- } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_EXPIRED)) { // 已逾期
|
|
|
+ } else if (pageReqVO.getContactStatus().equals(CrmCustomerPageReqVO.CONTACT_EXPIRED)) { // 已逾期
|
|
|
query.lt(CrmCustomerDO::getContactNextTime, beginOfToday);
|
|
|
- } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_ALREADY)) { // 已联系
|
|
|
+ } else if (pageReqVO.getContactStatus().equals(CrmCustomerPageReqVO.CONTACT_ALREADY)) { // 已联系
|
|
|
query.between(CrmCustomerDO::getContactLastTime, beginOfToday, endOfToday);
|
|
|
} else {
|
|
|
throw new IllegalArgumentException("未知联系状态：" + pageReqVO.getContactStatus());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
return selectJoinPage(pageReqVO, CrmCustomerDO.class, query);
|
|
|
}
|
|
|
|
|
|
+ default List<CrmCustomerDO> selectBatchIds(Collection<Long> ids, Long userId) {
|
|
|
+ MPJLambdaWrapperX<CrmCustomerDO> query = new MPJLambdaWrapperX<>();
|
|
|
+ // 拼接数据权限的查询条件
|
|
|
+ CrmQueryWrapperUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(), ids, userId);
|
|
|
+ // 拼接自身的查询条件
|
|
|
+ query.selectAll(CrmCustomerDO.class).in(CrmCustomerDO::getId, ids).orderByDesc(CrmCustomerDO::getId);
|
|
|
+ return selectJoinList(CrmCustomerDO.class, query);
|
|
|
+ }
|
|
|
+
|
|
|
default List<CrmCustomerDO> selectListByLockAndNotPool(Boolean lockStatus) {
|
|
|
return selectList(new LambdaQueryWrapper<CrmCustomerDO>()
|
|
|
.eq(CrmCustomerDO::getLockStatus, lockStatus)
|
|
|
@@ -118,7 +106,9 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
|
|
|
// 拼接数据权限的查询条件
|
|
|
CrmQueryWrapperUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
|
|
|
CrmCustomerDO::getId, userId, pageReqVO.getSceneType(), null);
|
|
|
- // TODO @dhb52：lock 的情况，不需要提醒哈；
|
|
|
+
|
|
|
+ // 锁定状态不需要提醒
|
|
|
+ query.ne(CrmCustomerDO::getLockStatus, true);
|
|
|
|
|
|
// 拼接自身的查询条件
|
|
|
query.selectAll(CrmCustomerDO.class);
|
dhb52