From a862c36323b8c6b47f8c41f3860ac93411348c4c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:56:18 +0800
Subject: [PATCH] Merge branch 'dev_海西州_惠牧' into dev_海西州_惠牧2
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
index 2322603..5c277a4 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
@@ -49,10 +49,20 @@
}
default PageResult<CrmCustomerDO> selectPage(CrmCustomerPageReqVO pageReqVO, Long ownerUserId) {
+ return selectPage(pageReqVO, ownerUserId,
+ Boolean.TRUE.equals(pageReqVO.getPool()) && CrmPermissionUtils.isSuperAdmin());
+ }
+
+ default PageResult<CrmCustomerDO> selectPage(CrmCustomerPageReqVO pageReqVO, Long ownerUserId,
+ boolean superAdmin) {
MPJLambdaWrapperX<CrmCustomerDO> query = new MPJLambdaWrapperX<>();
- // 鎷兼帴鏁版嵁鏉冮檺鐨勬煡璇㈡潯浠�
+ // 鍏捣灞曠ず鍏佽鍏变韩鐨勫鎴凤紙鍖呭惈宸叉湁璐熻矗浜猴級锛屼笌瀹㈡埛绠＄悊浣跨敤鍚屼竴浠芥暟鎹��
if (Boolean.TRUE.equals(pageReqVO.getPool())) {
- query.isNull(CrmCustomerDO::getOwnerUserId);
+ query.eq(!superAdmin, CrmCustomerDO::getAutoPoolEnabled, true);
+ } else if (CrmSceneTypeEnum.isAll(pageReqVO.getSceneType())) {
+ // 鍦烘櫙鍥涳細鍏ㄩ儴鏁版嵁锛屼笉鍖哄垎鍏捣/闈炲叕娴凤紝鐢� appendPermissionCondition 缁熶竴澶勭悊
+ CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
+ CrmCustomerDO::getId, ownerUserId, pageReqVO.getSceneType());
} else {
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
CrmCustomerDO::getId, ownerUserId, pageReqVO.getSceneType());
@@ -64,6 +74,7 @@
.eqIfPresent(CrmCustomerDO::getIndustryId, pageReqVO.getIndustryId())
.eqIfPresent(CrmCustomerDO::getLevel, pageReqVO.getLevel())
.eqIfPresent(CrmCustomerDO::getSource, pageReqVO.getSource())
+ .eqIfPresent(CrmCustomerDO::getAutoPoolEnabled, pageReqVO.getAutoPoolEnabled())
.eqIfPresent(CrmCustomerDO::getFollowUpStatus, pageReqVO.getFollowUpStatus());
// backlog 鏌ヨ
@@ -111,7 +122,8 @@
CrmCustomerDO::getId, ownerUserId, pageReqVO.getSceneType());
// 鏈攣瀹� + 鏈垚浜�
- query.eq(CrmCustomerDO::getLockStatus, false).eq(CrmCustomerDO::getDealStatus, false);
+ query.eq(CrmCustomerDO::getLockStatus, false).eq(CrmCustomerDO::getDealStatus, false)
+ .eq(CrmCustomerDO::getAutoPoolEnabled, true);
// 鎯呭喌涓�锛氭湭鎴愪氦鎻愰啋鏃ユ湡鍖洪棿
Integer dealExpireDays = poolConfig.getDealExpireDays();
@@ -143,7 +155,8 @@
LambdaQueryWrapper<CrmCustomerDO> query = new LambdaQueryWrapper<>();
query.gt(CrmCustomerDO::getOwnerUserId, 0);
// 鏈攣瀹� + 鏈垚浜�
- query.eq(CrmCustomerDO::getLockStatus, false).eq(CrmCustomerDO::getDealStatus, false);
+ query.eq(CrmCustomerDO::getLockStatus, false).eq(CrmCustomerDO::getDealStatus, false)
+ .eq(CrmCustomerDO::getAutoPoolEnabled, true);
// 宸茬粡瓒呮椂
LocalDateTime dealExpireTime = LocalDateTime.now().minusDays(poolConfig.getDealExpireDays());
LocalDateTime contactExpireTime = LocalDateTime.now().minusDays(poolConfig.getContactExpireDays());
@@ -180,4 +193,26 @@
return selectCount(query);
}
+ // ========== 缁熻鏂规硶 ==========
+
+ default Long selectTodayCount() {
+ LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+ LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
+ return selectCount(new LambdaQueryWrapperX<CrmCustomerDO>()
+ .between(CrmCustomerDO::getCreateTime, beginOfToday, endOfToday));
+ }
+
+ default Long selectDealCount() {
+ return selectCount(CrmCustomerDO::getDealStatus, true);
+ }
+
+ default Long selectLockCount() {
+ return selectCount(CrmCustomerDO::getLockStatus, true);
+ }
+
+ default Long selectPoolCount() {
+ return selectCount(new LambdaQueryWrapperX<CrmCustomerDO>()
+ .eq(!CrmPermissionUtils.isSuperAdmin(), CrmCustomerDO::getAutoPoolEnabled, true));
+ }
+
}
--
Gitblit v1.9.3