|
@@ -4108,9 +4108,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
List<CourseScheduleRateDto> courseScheduleRateDtos = courseScheduleDao.findCourseRate(schedule.getMusicGroupId(),schedule.getGroupType().getCode());
|
|
|
//获取最近一次已结束的课程
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.getLastEndCourse(schedule.getMusicGroupId(),schedule.getGroupType().getCode());
|
|
|
+ List<Long> courseScheduleIds = courseScheduleRateDtos.stream().map(CourseScheduleRateDto::getCourseScheduleId).collect(Collectors.toList());
|
|
|
+ List<CourseScheduleReview> courseReviews = courseScheduleReviewDao.findByCourseSchedules(courseScheduleIds);
|
|
|
+ Map<Integer, List<CourseScheduleReview>> reviews = courseReviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));
|
|
|
+
|
|
|
//标记当前课程的上一节课
|
|
|
if(courseSchedule != null){
|
|
|
for (CourseScheduleRateDto e:courseScheduleRateDtos) {
|
|
|
+ if(reviews.containsKey(e.getCourseScheduleId().intValue())){
|
|
|
+ List<CourseScheduleReview> review = reviews.get(e.getCourseScheduleId().intValue());
|
|
|
+ e.setTeachingContent(review.get(0).getTeachingMaterial());
|
|
|
+ }
|
|
|
if(e.getCourseScheduleId().equals(courseSchedule.getId())){
|
|
|
e.setIsDefault(true);
|
|
|
break;
|