Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -566,34 +566,32 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		}
 		List<TeacherIndexWrapper.PracticeTimeDto> studentTrainTime = sysMusicCompareRecordDao.getStudentTrainTime(studentIds, summarySearch, groupBy);
 		//补全时间段
-		fillData(studentTrainTime,dateList);
-		teacherPracticeHome.setPracticeTimes(studentTrainTime);
+		teacherPracticeHome.setPracticeTimes(fillData(studentTrainTime,dateList));
 		//练习人数
 		List<TeacherIndexWrapper.PracticeTimeDto> studentTrainCount = sysMusicCompareRecordDao.getStudentTrainCount(studentIds, summarySearch, groupBy);
 		//补全时间段
-		fillData(studentTrainCount,dateList);
-		teacherPracticeHome.setPracticeCounts(studentTrainCount);
+		teacherPracticeHome.setPracticeCounts(fillData(studentTrainCount,dateList));
 
         return teacherPracticeHome;
     }
 
-	//数据补全
-	private void fillData(List<TeacherIndexWrapper.PracticeTimeDto> studentTrainTime, List<String> dateList) {
+	//数据补全，按时间顺序
+	private List<TeacherIndexWrapper.PracticeTimeDto> fillData(List<TeacherIndexWrapper.PracticeTimeDto> studentTrainTime, List<String> dateList) {
 		if(CollectionUtils.isEmpty(studentTrainTime)){
-			return;
+			return studentTrainTime;
 		}
-		for (String date : dateList) {
-			boolean flag = false;
-			for (TeacherIndexWrapper.PracticeTimeDto practiceTimeDto : studentTrainTime) {
-				if(StringUtils.equals(date,practiceTimeDto.getDate())){
-					flag = true;
-					break;
-				}
-			}
-			if(!flag){
-				studentTrainTime.add(new TeacherIndexWrapper.PracticeTimeDto(date,0L));
+		Map<String,TeacherIndexWrapper.PracticeTimeDto> timeMap = studentTrainTime.stream()
+				.collect(Collectors.toMap(TeacherIndexWrapper.PracticeTimeDto::getDate, o -> o));
+		List<TeacherIndexWrapper.PracticeTimeDto> result = new ArrayList<>();
+		for (String s : dateList) {
+			TeacherIndexWrapper.PracticeTimeDto practiceTimeDto = timeMap.get(s);
+			if(Objects.nonNull(practiceTimeDto)){
+				result.add(practiceTimeDto);
+			}else {
+				result.add(new TeacherIndexWrapper.PracticeTimeDto(s,0L));
 			}
 		}
+		return result;
 	}
 
 	@Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -598,7 +598,7 @@
 	</select>
 	<select id="getStudentTrainOverViewList"
 			resultType="com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper$StudentPracticeSummaryDto">
-		select su.username_ studentName,GROUP_CONCAT(sb.name_) subjectName,SUM(smcr.play_time_) totalPracticeTime,
+		select su.username_ studentName,sb.name_ subjectName,SUM(smcr.play_time_) totalPracticeTime,
 		       COUNT(DISTINCT DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')) practiceDays,
 		       SUM(smcr.play_time_) / COUNT(DISTINCT DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')) averagePracticeTime
 		from sys_music_compare_record smcr