|
|
@@ -4953,15 +4953,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
throw new BizException("非进行中课程组不可编辑");
|
|
|
}
|
|
|
if(courseStartDate.after(coursesExpireDate)){
|
|
|
- throw new BizException("课程组有效结束时间不能早于课程组有效结开始时间");
|
|
|
+ throw new BizException("课程组有效结束时间不能早于课程组有效开始时间");
|
|
|
}
|
|
|
Date minCourseTime = courseScheduleDao.getMinCourseTime(PRACTICE, practiceGroupId);
|
|
|
if(Objects.nonNull(minCourseTime)&&courseStartDate.compareTo(minCourseTime)>0){
|
|
|
- throw new BizException("课程组有效结开始时间不得晚于第一节课开始时间");
|
|
|
+ throw new BizException("课程组有效开始时间不得晚于第一节课开始时间");
|
|
|
}
|
|
|
Date maxCourseTime = courseScheduleDao.getMaxCourseTime(PRACTICE, practiceGroupId);
|
|
|
- if(Objects.nonNull(maxCourseTime)&&coursesExpireDate.compareTo(maxCourseTime)<0){
|
|
|
- throw new BizException("课程组有效结结束时间不得早于最后一节课结束时间");
|
|
|
+ if(Objects.nonNull(maxCourseTime)&&!DateUtil.isSameDay(maxCourseTime, coursesExpireDate)&&coursesExpireDate.compareTo(maxCourseTime)<0){
|
|
|
+ throw new BizException("课程组有效结束时间不得早于最后一节课结束时间");
|
|
|
}
|
|
|
// if(Objects.nonNull(practiceGroup.getBuyMonths())){
|
|
|
// LocalDate courseStartDay = LocalDateTime.ofInstant(practiceGroup.getCoursesStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
Joburgess