From 74603393817a27fefd0a1fe1e9fd693be55c507b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 29 Jan 2021 09:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/UserPointTotalServiceImpl.java  | 3 +--
 .../main/resources/mapper/UserPointStatisticalDailyDao.xml | 7 ++++++-
 .../src/main/resources/mapper/UserPointTotalDao.xml        | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
index 6bace14ee9..b4404dab1f 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
@@ -158,7 +158,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         }
         //2.查询排行榜信息，个人排行(分页)
         if(NumConstant.ONE < pointRankFormDTO.getPageNo()){
-            PageHelper.startPage(pointRankFormDTO.getPageNo(),pointRankFormDTO.getPageSize());
+           PageHelper.startPage(pointRankFormDTO.getPageNo(),pointRankFormDTO.getPageSize());
         }
         //排行榜
         List<ResiPointRankResultDTO> rankList =
@@ -199,7 +199,6 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
             }
             //将假分页结果替换到rankList
             rankList = rankList.subList(fromIndex,toIndex);
-
         }
 
         List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
index 983301e016..d49ca80396 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml
@@ -25,6 +25,8 @@
     <!--  查询客户下周/月度用户积分排行榜 传参：客户Id | 维度 | 维度值 -->
     <!-- user_point_statistical_daily中的action_flag有三种key值，plus(获取)，exchange(积分兑换)，minus(调整、惩罚)，当action_flag为minus时,point_change为负值，其余均为正数 -->
     <select id="selectPointRankWithinTimeZone" resultType="com.epmet.dto.result.ResiPointRankResultDTO">
+        select * from (
+
         SELECT IF ( @point > point.TOTAL_POINT,
         @rank := @rank + 1,
         @rank := @rank + 0
@@ -38,7 +40,8 @@
         total.USER_ID,
 
         IF
-        ( IFNULL( SUM( daily.POINT_CHANGE ), 0 )  <![CDATA[ < ]]> 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS TOTAL_POINT
+        ( IFNULL( SUM( daily.POINT_CHANGE ), 0 )  <![CDATA[ < ]]> 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS
+        TOTAL_POINT
         FROM
         user_point_total total
         LEFT JOIN user_point_statistical_daily daily ON daily.USER_ID = total.USER_ID
@@ -61,6 +64,8 @@
         TOTAL_POINT DESC
         ) point,
         ( SELECT @point := NULL, @rank := 1 ) a
+
+        ) temp
     </select>
 
     <!-- 查询有无指定日期的积分日统计 userId dateId actionFlag-->
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
index e64d984a00..bcf4735cb8 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
@@ -48,6 +48,9 @@
 
     <!-- 查询客户下的用户积分排行，分页  传参:customerId -->
     <select id="selectUserPointRank" resultType="com.epmet.dto.result.ResiPointRankResultDTO">
+
+        select * from (
+
         SELECT
             IF ( @point > point.total_point, @rank := @rank + 1, @rank := @rank + 0 ) AS rank,
             point.user_id,
@@ -57,6 +60,8 @@
         FROM
             ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} ORDER BY total_point DESC ) point,
             ( SELECT @point := NULL, @rank := 1 ) a
+
+            ) temp
     </select>
 
     <!-- 根据userId查找是否存在数据 -->