|
|
@@ -5592,20 +5592,22 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
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));
|
|
|
-
|
|
|
+ List<CourseSchedule> courseScheduleList = courseScheduleDao.findByCourseScheduleIds(courseScheduleIds);
|
|
|
+ Map<Long, List<CourseSchedule>> courseMap = courseScheduleList.stream().collect(Collectors.groupingBy(e -> e.getId()));
|
|
|
MusicGroupTrainPlanSaveDto schoolTerm = null;
|
|
|
List<MusicGroupTrainPlan> planList = null;
|
|
|
for (CourseScheduleRateDto scheduleRateDto : courseScheduleRateDtos) {
|
|
|
+ CourseSchedule course = courseMap.get(scheduleRateDto.getCourseScheduleId()).get(0);
|
|
|
if(schoolTerm == null){
|
|
|
- schoolTerm = musicGroupTrainPlanService.getSchoolTerm(courseSchedule);
|
|
|
+ schoolTerm = musicGroupTrainPlanService.getSchoolTerm(course);
|
|
|
planList = musicGroupTrainPlanService.queryPlan(schoolTerm);
|
|
|
}else {
|
|
|
- MusicGroupTrainPlanSaveDto schoolTerm1 = musicGroupTrainPlanService.getSchoolTerm(courseSchedule);
|
|
|
+ MusicGroupTrainPlanSaveDto schoolTerm1 = musicGroupTrainPlanService.getSchoolTerm(course);
|
|
|
if(!DateUtil.format(schoolTerm1.getStartSchoolTerm(),DateUtil.ISO_EXPANDED_DATE_FORMAT).
|
|
|
equals(DateUtil.format(schoolTerm.getStartSchoolTerm(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
|
|
|
- schoolTerm = schoolTerm1;
|
|
|
planList = musicGroupTrainPlanService.queryPlan(schoolTerm);
|
|
|
}
|
|
|
+ schoolTerm = schoolTerm1;
|
|
|
}
|
|
|
int courseNumNo = courseScheduleDao.getCourseNumNo(schoolTerm);
|
|
|
if(planList.size() >= courseNumNo){
|
zouxuan