diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 33d8115ba5..6e64ece5e5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1233,6 +1233,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl unAchievedList = resiGroupAchievementStatsService.getUnAchieved(formDTO.getGroupId()); if (CollectionUtils.isNotEmpty(unAchievedList)) { + unAchievedList.sort(Comparator.comparing(o-> o.getCurrentValue()/o.getTargetValue())); unAchievedList.forEach(item -> { AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean(); String describe = item.getAchievementName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")"; diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml index 03b7aef721..6956a34248 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml @@ -33,7 +33,7 @@ AND GROUP_ID = #{groupId} AND IS_ARRIVE = 0 ORDER BY - CURRENT_VALUE / TARGET_VALUE ASC + CURRENT_VALUE / TARGET_VALUE DESC LIMIT 3