From 9ab53ee2637a8e04a2134642b62421c879e5d779 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Apr 2024 23:12:36 +0800
Subject: [PATCH] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmStatisticsPerformanceServiceImpl.java  | 10 +++++++++-
 .../CrmStatisticsPerformanceMapper.xml        | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
index 4c4193f7b..fcd7267a8 100644
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
@@ -40,7 +40,7 @@ public class CrmStatisticsPerformanceServiceImpl implements CrmStatisticsPerform
 
     @Override
     public List<CrmStatisticsPerformanceRespVO> getContractCountPerformance(CrmStatisticsPerformanceReqVO performanceReqVO) {
-        // TODO @scholar：我们可以换个思路实现，减少数据库的计算量；
+        // TODO @scholar：可以把下面这个注释，你理解后，重新整理下，写到 getPerformance 里；
         // 比如说，2024 年的合同数据，是不是 2022-12 到 2024-12-31，每个月的统计呢？
         // 理解之后，我们可以数据 group by 年-月，20222-12 到 2024-12-31 的，然后内存在聚合出 CrmStatisticsPerformanceRespVO 这样
         // 这样，我们就可以减少数据库的计算量，提升性能；同时 SQL 也会很简单，开发者理解起来也简单哈；
@@ -57,6 +57,7 @@ public class CrmStatisticsPerformanceServiceImpl implements CrmStatisticsPerform
         return getPerformance(performanceReqVO, performanceMapper::selectReceivablePricePerformance);
     }
 
+    // TODO @scholar：代码注释，应该有 3 个变量哈；
     /**
      * 获得员工业绩数据
      *
@@ -64,9 +65,11 @@ public class CrmStatisticsPerformanceServiceImpl implements CrmStatisticsPerform
      * @param performanceFunction 员工业绩统计方法
      * @return 员工业绩数据
      */
+    // TODO @scholar：下面一行的变量，超过一行了，阅读不美观；可以考虑每一行一个变量；
     private List<CrmStatisticsPerformanceRespVO> getPerformance(CrmStatisticsPerformanceReqVO performanceReqVO, Function<CrmStatisticsPerformanceReqVO,
             List<CrmStatisticsPerformanceRespVO>> performanceFunction) {
 
+        // TODO @scholar：没使用到的变量，建议删除；
         List<CrmStatisticsPerformanceRespVO> performanceRespVOList;
 
         // 1. 获得用户编号数组
@@ -75,10 +78,15 @@ public class CrmStatisticsPerformanceServiceImpl implements CrmStatisticsPerform
             return Collections.emptyList();
         }
         performanceReqVO.setUserIds(userIds);
+        // TODO @scholar：1. 和 2. 之间，可以考虑换一行；保证每一块逻辑的间隔；
         // 2. 获得业绩数据
+        // TODO @scholar：复数变量，建议使用 s 或者 list 结果；这里用 performanceList  好列；
         List<CrmStatisticsPerformanceRespVO> performance = performanceFunction.apply(performanceReqVO);
 
         // 获取查询的年份
+        // TODO @scholar：逻辑可以简化一下；
+        // TODO 1）把 performance 转换成 map；key 是 time，value 是 count
+        // TODO 2）当前年，遍历 1-12 月份，去 map 拿到 count；接着月份 -1，去 map 拿 count；再年份 -1，拿 count
         String currentYear = LocalDateTimeUtil.format(performanceReqVO.getTimes()[0],"yyyy");
 
         // 构造查询当年和前一年，每年12个月的年月组合
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
index ee9ec4e44..79ff45471 100644
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
@@ -5,20 +5,23 @@
     <select id="selectContractCountPerformance"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
         SELECT
-        DATE_FORMAT(order_date, '%Y%m') AS time,
-        COUNT(1) AS currentMonthCount
-        FROM	crm_contract
+            DATE_FORMAT(order_date, '%Y%m') AS time,
+            COUNT(1) AS currentMonthCount
+        FROM crm_contract
         WHERE deleted = 0
+        <!-- TODO @scholar：20 改成静态类引入 -->
         AND audit_status = 20
         AND owner_user_id in
-        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-            #{userId}
-        </foreach>
-        AND (DATE_FORMAT(order_date, '%Y') = DATE_FORMAT(#{times[0],javaType=java.time.LocalDateTime},'%Y')
-        or DATE_FORMAT(order_date, '%Y') = DATE_FORMAT(#{times[0],javaType=java.time.LocalDateTime},'%Y')-1)
+            <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                #{userId}
+            </foreach>
+        <!-- TODO @scholar：CrmStatisticsPerformanceReqVO 传递 year，然后 java 代码里，转换出 times；这样，order_time 使用范围查询，避免使用函数 -->
+        AND (DATE_FORMAT(order_date, '%Y') = DATE_FORMAT(#{times[0],javaType=java.time.LocalDateTime}, '%Y')
+        or DATE_FORMAT(order_date, '%Y') = DATE_FORMAT(#{times[0],javaType=java.time.LocalDateTime}, '%Y') - 1)
         GROUP BY time
     </select>
 
+    <!-- TODO @scholar：参考上面，调整下这个 SQL 的排版、和代码建议哈 -->
     <select id="selectContractPricePerformance"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
         SELECT
@@ -36,6 +39,7 @@
         GROUP BY time
     </select>
 
+    <!-- TODO @scholar：参考上面，调整下这个 SQL 的排版、和代码建议哈 -->
     <select id="selectReceivablePricePerformance"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
         SELECT