|
@@ -1291,6 +1291,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
|
|
|
Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
|
|
|
Date courseEndTime = DateUtil.addMinutes(courseStartTime, vipGroup.getSingleClassMinutes());
|
|
|
+ if(DateUtil.daysBetween(DateUtil.stringToDate(DateUtil.format(courseStartTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN),
|
|
|
+ DateUtil.stringToDate(DateUtil.format(courseEndTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN)) > 0){
|
|
|
+ throw new BizException("单节课时不允许跨天");
|
|
|
+ }
|
|
|
courseStartDates.add(DateUtil.stringToDate(dateYmdStr, DateUtil.EXPANDED_DATE_TIME_FORMAT));
|
|
|
int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(courseSchedules.get(courseStartDates.size() - 1).getId().intValue());
|
|
|
if (settlementNum > 0) {
|
|
@@ -1718,7 +1722,9 @@ 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(newCourseTime < 0){
|
|
|
+ throw new BizException("单节课时不允许跨天");
|
|
|
+ }
|
|
|
if (newCourseTime != oldCourseTime) {
|
|
|
courseTimeIsChange = true;
|
|
|
}
|
|
@@ -2606,6 +2612,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(DateUtil.minutesBetween(practiceGroup.getCoursesExpireDate(),endDateTime) > 0){
|
|
|
throw new BizException("调整失败: 截止时间超过课程有效期");
|
|
|
}
|
|
|
+ if(DateUtil.daysBetween(DateUtil.stringToDate(DateUtil.format(startDateTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN),
|
|
|
+ DateUtil.stringToDate(DateUtil.format(endDateTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN)) > 0){
|
|
|
+ throw new BizException("单节课时不允许跨天");
|
|
|
+ }
|
|
|
//保存修改记录
|
|
|
Date date = new Date();
|
|
|
CourseScheduleModifyLog scheduleModifyLog = new CourseScheduleModifyLog();
|