|
@@ -1722,9 +1722,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
boolean courseTimeIsChange = false;
|
|
|
int newCourseTime = DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime());
|
|
|
int oldCourseTime = DateUtil.minutesBetween(oldCourseSchedule.getStartClassTime(), oldCourseSchedule.getEndClassTime());
|
|
|
- if(oldCourseTime < 0){
|
|
|
- throw new BizException("单节课时不允许跨天");
|
|
|
- }
|
|
|
if (newCourseTime != oldCourseTime) {
|
|
|
courseTimeIsChange = true;
|
|
|
}
|
|
@@ -1737,7 +1734,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
|
|
|
oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());
|
|
|
oldCourseSchedule.setStatus(newCourseSchedule.getStatus());
|
|
|
-
|
|
|
+ int minutesBetween = DateUtil.minutesBetween(oldCourseSchedule.getStartClassTime(), oldCourseSchedule.getEndClassTime());
|
|
|
+ if(minutesBetween < 0){
|
|
|
+ throw new BizException("单节课时不允许跨天");
|
|
|
+ }
|
|
|
//被修改的教师编号列表,需要将预计薪水置零
|
|
|
List<Integer> beReplaceTeacherIds = new ArrayList<>();
|
|
|
|