From 30ee0c8e97b681593887b054c7eab3a6094bf002 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 7 Dec 2020 17:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=88=B1=E5=BF=83?= =?UTF-8?q?=E6=A6=9Cheart/resi/act/leaderboard=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java | 1 + .../com/epmet/service/impl/HeartUserInfoServiceImpl.java | 5 +++-- .../src/main/resources/mapper/HeartUserInfoDao.xml | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java index 44964cfd73..d0c223741c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java @@ -57,4 +57,5 @@ public class ResiLeaderboardResultDTO implements Serializable { * 参加次数 */ private Integer participationNum; + private String userId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java index 5c1dfaea87..91c1f7df09 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.entity.HeartUserInfoEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.HeartUserInfoRedis; import com.epmet.service.HeartUserInfoService; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -128,9 +129,8 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl> leaderboard(ResiActBaseFormDTO formDTO) { List resultDtoS = new ArrayList<>(); - int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - formDTO.setPageNo(pageIndex); // 获取排好序的 排行榜 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List leaderboardList = baseDao.selectListLeaderboard(formDTO); if (leaderboardList.size() > NumConstant.ZERO){ // 根据用户ID获取微信昵称、头像 @@ -143,6 +143,7 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO){ for (HeartUserInfoDTO list : leaderboardList){ ResiLeaderboardResultDTO dto = new ResiLeaderboardResultDTO(); + dto.setUserId(list.getUserId()); dto.setKindnessTime(list.getKindnessTime()); dto.setVolunteerFlag(list.getVolunteerFlag()); dto.setParticipationNum(list.getParticipationNum()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml index 9df9414e17..009f9c2ea3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml @@ -51,8 +51,7 @@ FROM heart_user_info ui WHERE ui.DEL_FLAG = '0' AND ui.CUSTOMER_ID = #{customerId} - ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC - LIMIT #{pageNo}, #{pageSize} + ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC,ui.VOLUNTEER_FLAG desc,ui.CREATED_TIME asc