Unread enquires

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GADailyReportServiceImpl.java

@@ -2,13 +2,12 @@ package org.jeecg.modules.adweb.dmp.service.impl;
 
 import static org.jeecg.modules.adweb.dmp.vo.report.SiteOverviewStatsVO.DailyStatsVO;
 
-import cn.hutool.core.lang.Pair;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.common.util.NumberUtil;
@@ -109,9 +108,9 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
                 });
 
         // 3. 询盘数据补充
-        List<Pair<String, Long>> enquiryDailyCounts =
+        List<ImmutablePair<String, Long>> enquiryDailyCounts =
                 adwebEnquiryMapper.getEnquiryDailyCounts(siteCode, start, end);
-        for (Pair<String, Long> enquiryDailyCount : enquiryDailyCounts) {
+        for (ImmutablePair<String, Long> enquiryDailyCount : enquiryDailyCounts) {
             if (!dailyStatsVOs.containsKey(enquiryDailyCount.getKey())) {
                 continue;
             }
@@ -148,9 +147,9 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
                                         LinkedHashMap::new)); // 使用LinkedHashMap保持原查询顺序
 
         // 2. 询盘数据补充
-        List<Pair<String, Long>> enquiryPeriodicCounts =
+        List<ImmutablePair<String, Long>> enquiryPeriodicCounts =
                 adwebEnquiryMapper.getEnquiryPeriodicCounts(siteCode);
-        for (Pair<String, Long> enquiryPeriodicCount : enquiryPeriodicCounts) {
+        for (ImmutablePair<String, Long> enquiryPeriodicCount : enquiryPeriodicCounts) {
             if (!periodicStatsVOs.containsKey(enquiryPeriodicCount.getKey())) {
                 continue;
             }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/AdwebEnquiryMapper.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.adweb.enquiry.mapper;
 
-import cn.hutool.core.lang.Pair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.adweb.enquiry.dto.EnquiryDTO;
 import org.jeecg.modules.adweb.enquiry.dto.param.EnquirySearchDto;
@@ -13,10 +14,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: 询盘信息存储表单
- * @Author: jeecg-boot
- * @Date: 2024-10-12
- * @Version: V1.0
+ * @Description: 询盘信息存储表单 @Author: jeecg-boot @Date: 2024-10-12 @Version: V1.0
  */
 public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
 
@@ -28,22 +26,21 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param ctimeEnd
      * @return
      */
-    IPage<EnquiryListDto> selectEnquiryList(IPage<EnquirySearchDto> page,
-                                            @Param("codeList") List<String> codeList,
-                                            @Param("userEffective") String userEffective,
-                                            @Param("wasteEnquiryType") String wasteEnquiryType,
-                                            @Param("searchText") String searchText,
-                                            @Param("searchContent") String searchContent,
-                                            @Param("ctimeBegin") Date ctimeBegin,
-                                            @Param("ctimeEnd") Date ctimeEnd,
-                                            @Param("whatsApp") String whatsApp,
-                                            @Param("readStatus") Integer readStatus,
-                                            @Param("principalUid") String principalUid,
-                                            @Param("selfPrincipalUid") String selfPrincipalUid);
+    IPage<EnquiryListDto> selectEnquiryList(
+            IPage<EnquirySearchDto> page,
+            @Param("codeList") List<String> codeList,
+            @Param("userEffective") String userEffective,
+            @Param("wasteEnquiryType") String wasteEnquiryType,
+            @Param("searchText") String searchText,
+            @Param("searchContent") String searchContent,
+            @Param("ctimeBegin") Date ctimeBegin,
+            @Param("ctimeEnd") Date ctimeEnd,
+            @Param("whatsApp") String whatsApp,
+            @Param("readStatus") Integer readStatus,
+            @Param("principalUid") String principalUid,
+            @Param("selfPrincipalUid") String selfPrincipalUid);
 
-    /**
-     * 根据地区更新询盘跟进人
-     */
+    /** 根据地区更新询盘跟进人 */
     void updatePrincipalUidByRegion(Integer siteId, List<Integer> siteIds);
 
     /**
@@ -55,17 +52,25 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param ctimeEnd
      * @return
      */
-    IPage<EnquiryListDto> queryWasteEnquiryList(IPage<EnquirySearchDto> page,
-                                                @Param("codeList") List<String> codeList,
-                                                @Param("siteId") String siteId,
-                                                @Param("userEffective") String userEffective,
-                                                @Param("searchText") String searchText,
-                                                @Param("ctimeBegin") String ctimeBegin,
-                                                @Param("ctimeEnd") String ctimeEnd,
-                                                @Param("whatsApp") String whatsApp,
-                                                @Param("principalUid") String principalUid);
+    IPage<EnquiryListDto> queryWasteEnquiryList(
+            IPage<EnquirySearchDto> page,
+            @Param("codeList") List<String> codeList,
+            @Param("siteId") String siteId,
+            @Param("userEffective") String userEffective,
+            @Param("searchText") String searchText,
+            @Param("ctimeBegin") String ctimeBegin,
+            @Param("ctimeEnd") String ctimeEnd,
+            @Param("whatsApp") String whatsApp,
+            @Param("principalUid") String principalUid);
 
-    List<EnquiryListDto> getWastedEnquiry(String wasteEnquiryType, String ip, String email, String keyword, String searchText, String type, Integer siteId);
+    List<EnquiryListDto> getWastedEnquiry(
+            String wasteEnquiryType,
+            String ip,
+            String email,
+            String keyword,
+            String searchText,
+            String type,
+            Integer siteId);
 
     /**
      * 获取每日询盘数量
@@ -75,7 +80,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param end
      * @return List<Pair < String, Long>> -- MyBatis COUNT()方法默认类型为Long
      */
-    List<Pair<String, Long>> getEnquiryDailyCounts(String siteCode, Date start, Date end);
+    List<ImmutablePair<String, Long>> getEnquiryDailyCounts(String siteCode, Date start, Date end);
 
     /**
      * 获取分时间段的询盘数量 - 今天，昨天，本周，上周，本月，上月，全部
@@ -83,7 +88,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
      * @param siteCode
      * @return List<Pair < String, Long>> -- MyBatis COUNT()方法默认类型为Long
      */
-    List<Pair<String, Long>> getEnquiryPeriodicCounts(String siteCode);
+    List<ImmutablePair<String, Long>> getEnquiryPeriodicCounts(String siteCode);
 
     List<EnquiryDTO> getEnquiryList(String siteCode, String startTime, String endTime);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebEnquiryMapper.xml

@@ -304,7 +304,7 @@
         and t1.principal_type != 1
     </update>
 
-    <select id="getEnquiryDailyCounts" resultType="cn.hutool.core.lang.Pair">
+    <select id="getEnquiryDailyCounts" resultType="org.apache.commons.lang3.tuple.ImmutablePair">
         SELECT
         date_format(record_ctime, '%Y-%m-%d') `date`,
         count(id) enquires
@@ -323,7 +323,7 @@
         GROUP BY date
     </select>
 
-    <select id="getEnquiryPeriodicCounts" resultType="cn.hutool.core.lang.Pair">
+    <select id="getEnquiryPeriodicCounts" resultType="org.apache.commons.lang3.tuple.ImmutablePair">
         SELECT
         tp.period AS period,
         COALESCE(COUNT(id), 0) AS enquires