小组成就排序

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() + ")";

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">