|
|
@ -1205,7 +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())); |
|
|
|
Collections.reverse(unAchievedList); |
|
|
|
unAchievedList.forEach(item -> { |
|
|
|
AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean(); |
|
|
|
String describe = item.getAchievementName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")"; |
|
|
|