Merge branch 'hotfix/heartPointbug'

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java

@@ -62,6 +62,10 @@ public class EpdcAppVolunteerRankDTO implements Serializable {
      * 参加次数
      */
 	private Integer participationNum;
+    /**
+     * 新增 志愿者积分
+     */
+    private String integral;
 
 
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java

@@ -62,6 +62,10 @@ public class EpdcVolunteerRankDTO implements Serializable {
      * 参加次数
      */
 	private Integer participationNum;
+    /**
+     * 新增 志愿者积分
+     */
+    private String integral;
 
 
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java

@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.modules.volunteer.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -88,5 +87,9 @@ public class VolunteerRankEntity extends BaseEpdcEntity {
      * 是否显示(0-不显示，1-显示)
      */
 	private String showFlag;
+	/**
+	 * 新增 志愿者积分
+	 */
+	private String integral;
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml

@@ -24,7 +24,7 @@
     </resultMap>
 
     <select id="leaderboard" resultType="com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO">
-        select NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
+        select NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT,INTEGRAL
         from epdc_volunteer_rank
         where GENERATE_DATE = DATE_FORMAT(NOW(),'%Y-%m-%d')
         order by sort

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java

@@ -118,5 +118,9 @@ public class EpdcGetVolunteerRankDTO implements Serializable {
      * 删除标志
      */
 	private String delFlag;
+    /**
+     * 新增 志愿者积分
+     */
+    private String integral;
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -180,11 +180,12 @@
                 eu.NICKNAME,
                 eu.PARTY_FLAG,
                 vi.KINDNESS_TIME,
-                vi.PARTICIPATION_NUM
+                vi.PARTICIPATION_NUM,
+                eu.POINTS INTEGRAL
             from epdc_volunteer_info vi
             left join epdc_user eu on eu.id = vi.USER_ID
             WHERE vi.DEL_FLAG = '0'  AND vi.AUDIT_STATUS = '1'
-            order by vi.KINDNESS_TIME desc,vi.PARTICIPATION_NUM desc,vi.REGIST_TIME  ) as info, (select @i:=0) j ) volunteerInfo
+            order by eu.POINTS DESC,vi.PARTICIPATION_NUM desc,vi.REGIST_TIME  ) as info, (select @i:=0) j ) volunteerInfo
         where sort < 11
     </select>
     <!--  根据用户id查询志愿者信息  -->