From 1d0594e57d5c1da99db389c99291fa07490f1cf2 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 11 May 2020 15:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95-=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=8E=92=E8=A1=8C=E6=8E=A5=E5=8F=A3=20=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=E5=88=86=E7=BB=84=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=9C=80=E6=96=B0=E7=9A=84=20=20=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/PointsLogsDao.xml   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
index d75c9035..16d87c73 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
@@ -81,24 +81,29 @@
     <select id="selectListPointsRanking" resultType="com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO">
         SELECT
         tab.USER_ID userId,
-        tab.NICKNAME nickName,
+        (
+        SELECT NICKNAME
+        FROM epdc_points_logs
+        WHERE tab.USER_ID = USER_ID
+        ORDER BY CREATED_TIME DESC
+        limit 0,1
+        ) nickName,
         (tab.totalPointsAdd - tab.totalPointsDeducted) points
         FROM(
-        SELECT
-        USER_ID,
-        NICKNAME,
-        SUM(case when OPERATION_TYPE = 0 then IFNULL(points,0) else 0 end) totalPointsDeducted,
-        SUM(case when OPERATION_TYPE = 1 then IFNULL(points,0) else 0 end) totalPointsAdd
-        FROM epdc_points_logs
-        WHERE DEL_FLAG = 0
-        <if test="rankingType != null and rankingType == 0">
-            AND YEARWEEK(date_format(OPERATION_TIME,'%Y-%m-%d')) = YEARWEEK(now())
-        </if>
-        <if test="rankingType != null and rankingType == 1">
-            AND DATE_FORMAT( OPERATION_TIME, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
-        </if>
-        GROUP BY USER_ID
+            SELECT
+            USER_ID,
+            SUM(case when OPERATION_TYPE = 0 then IFNULL(points,0) else 0 end) totalPointsDeducted,
+            SUM(case when OPERATION_TYPE = 1 then IFNULL(points,0) else 0 end) totalPointsAdd
+            FROM epdc_points_logs
+            WHERE DEL_FLAG = 0
+            <if test="rankingType != null and rankingType == 0">
+                AND YEARWEEK(date_format(OPERATION_TIME,'%Y-%m-%d')) = YEARWEEK(now())
+            </if>
+            <if test="rankingType != null and rankingType == 1">
+                AND DATE_FORMAT( OPERATION_TIME, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
+            </if>
+            GROUP BY USER_ID
         ) tab ORDER BY (tab.totalPointsAdd - tab.totalPointsDeducted) DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>