|
@@ -705,9 +705,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
|
|
|
applyDateRangeCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
- for (int j = 0; j < applyDateRangeCourses.size() - 1; j++) {
|
|
|
+ for (int j = 0; j < applyDateRangeCourses.size(); j++) {
|
|
|
CourseSchedule preCourseSchedule = applyDateRangeCourses.get(j);
|
|
|
- CourseSchedule backCourseSchedule = applyDateRangeCourses.get(j + 1);
|
|
|
+ CourseSchedule backCourseSchedule = j>=applyDateRangeCourses.size()-1?preCourseSchedule:applyDateRangeCourses.get(j + 1);
|
|
|
if (preCourseSchedule.getEndClassTime().after(backCourseSchedule.getEndClassTime())) {
|
|
|
backCourseSchedule.setEndClassTime(preCourseSchedule.getEndClassTime());
|
|
|
}
|
|
@@ -722,7 +722,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (j == applyDateRangeCourses.size() - 2) {
|
|
|
+ if (j == applyDateRangeCourses.size() - 1) {
|
|
|
for (Date enableApplyDate : tempEnableApplyDates) {
|
|
|
if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
|
|
|
continue;
|
|
@@ -732,6 +732,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if(j>=applyDateRangeCourses.size()-1){
|
|
|
+ break;
|
|
|
+ }
|
|
|
for (Date enableApplyDate : tempEnableApplyDates) {
|
|
|
if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
|
|
|
continue;
|
|
@@ -885,7 +888,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
return result;
|
|
|
}
|
|
|
SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
|
|
|
- practiceGroup.setName("陪练课•" + sysUser.getUsername());
|
|
|
+ practiceGroup.setName(subject.getName() + "•" + sysUser.getUsername());
|
|
|
practiceGroup.setSingleClassMinutes(practiceCourseMinutes);
|
|
|
practiceGroupDao.insert(practiceGroup);
|
|
|
|