Merge branch 'dev_mess_party' into dev_temp

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml

@@ -133,11 +133,15 @@
     <!--  身边党员-积分排行 ：按网格统计，对党员累计可用积分   排序 -->
     <select id="selectListGridPartyRankByUsablePoint" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
         SELECT
-            @curRank := @curRank + 1 AS ranking,
+            IF ( @point > p.USABLE_POINT,
+                @curRank := @curRank + 1,
+                @curRank := @curRank + 0
+            ) AS ranking,
+            @point := IFNULL(p.USABLE_POINT, 0),
             IFNULL(p.USABLE_POINT, 0) point,
 			p.USER_ID userId
         FROM
-		    user_point_total p, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
+		    user_point_total p, ( SELECT @curRank := #{pageNo} + 1 ) r
         <if test="null != userIds and userIds.size() > 0">
             WHERE p.USER_ID IN
             <foreach collection="userIds" item="userId" open="(" separator="," close=" )">
@@ -151,7 +155,11 @@
     <!--  身边党员-积分排行 ：按网格统计，对本月党员增加的积分 进行排序 -->
     <select id="selectListGridPartyRankByMonth" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
         SELECT
-            @curRank := @curRank + 1 AS ranking,
+            IF ( @point > p.point,
+                @curRank := @curRank + 1,
+                @curRank := @curRank + 0
+            ) AS ranking,
+            @point := p.point,
             P.userId,
             P.point
         FROM(
@@ -161,7 +169,7 @@
             FROM user_point_action_log pl
             WHERE pl.DEL_FLAG = '0' AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m')= DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND pl.action_flag = 'plus'
             GROUP BY pl.USER_ID
-        ) P, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
+        ) P, ( SELECT @curRank := #{pageNo} + 1 ) r
         <if test="null != userIds and userIds.size() > 0">
             WHERE userId IN
             <foreach collection="userIds" item="userId" open="(" separator="," close=" )">