zouxuan 5 år sedan
förälder
incheckning
038dbadf18

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1734,10 +1734,6 @@ 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<>();
 
@@ -1856,6 +1852,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
 
             oldCourseSchedule.setActualTeacherId(newCourseSchedule.getActualTeacherId());
+            if(DateUtil.daysBetween(DateUtil.stringToDate(DateUtil.format(oldCourseSchedule.getStartClassTime(),DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN),
+                    DateUtil.stringToDate(DateUtil.format(oldCourseSchedule.getEndClassTime(),DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN)) > 0){
+                throw new BizException("单节课时不允许跨天");
+            }
             courseScheduleDao.update(oldCourseSchedule);
             scheduleModifyLog.setCurrentCourseSchedule(JSONObject.toJSONString(oldCourseSchedule));
             courseScheduleModifyLogs.add(scheduleModifyLog);