浏览代码

feat:智能陪练一期

Joburgess 3 年之前
父节点
当前提交
8e48800e5b
共有 1 个文件被更改,包括 11 次插入9 次删除
  1. 11 9
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicCompareRecordServiceImpl.java

+ 11 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -121,22 +121,24 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 				break;
 		}
 
-		detail = userTrainStat.stream().limit(10).collect(Collectors.toList());
-		List<Integer> studentIds = detail.stream().map(MusicCompareRankingDto::getUserId).collect(Collectors.toList());
+		List<Integer> studentIds = detail.stream().limit(10).map(MusicCompareRankingDto::getUserId).collect(Collectors.toList());
 		Map<Integer, String> studentSubjectMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(studentIds)){
 			List<Map<Integer, String>> studentSubjectMapList = studentDao.getStudentSubjectMapList(studentIds);
 			studentSubjectMap = MapUtil.convertIntegerMap(studentSubjectMapList);
 		}
 
-		for (int i = 0; i < detail.size(); i++) {
-			detail.get(i).setRankNum(i+1);
-			detail.get(i).setTrainTime(detail.get(i).getTrainTime()/60);
-			if(detail.get(i).getUserId().equals(queryInfo.getUserId())){
-				head = detail.get(i);
+		for (int i = 0; i < userTrainStat.size(); i++) {
+			if(userTrainStat.get(i).getUserId().equals(queryInfo.getUserId())){
+				head = userTrainStat.get(i);
 			}
-			if(studentSubjectMap.containsKey(detail.get(i).getUserId())){
-				detail.get(i).setSubjectName(studentSubjectMap.get(detail.get(i).getUserId()));
+			if(studentSubjectMap.containsKey(userTrainStat.get(i).getUserId())){
+				userTrainStat.get(i).setSubjectName(studentSubjectMap.get(userTrainStat.get(i).getUserId()));
+			}
+			if(detail.size()<10){
+				userTrainStat.get(i).setRankNum(i+1);
+				userTrainStat.get(i).setTrainTime(userTrainStat.get(i).getTrainTime()/60);
+				detail.add(userTrainStat.get(i));
 			}
 		}
 		result.setHead(head);