From 7d51109b9f10aa9c8796f11c561ac928e3d887e3 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 26 Apr 2021 16:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java  | 1 +
 .../resources/mapper/group/ResiGroupAchievementStatsDao.xml     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 fbbd94623b..e44f2c4f79 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
@@ -1205,6 +1205,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//2.即将完成的3个成就
 		List<ResiGroupAchievementStatsDTO> 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
     </select>
     <select id="selectLastUnAchieved" resultMap="resiGroupAchievementStatsMap">