|
@@ -154,22 +154,6 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
|
|
|
newCourse.setName(courseGroup.getName());
|
|
|
newCourse.setOrganId(courseGroup.getOrganId());
|
|
|
}
|
|
|
- try {
|
|
|
- courseScheduleService.checkNewCourseSchedules(newCourses, false);
|
|
|
- } catch (Exception e) {
|
|
|
- LOGGER.error("检查课程冲突出现异常",e);
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- String errMessage;
|
|
|
- String courseName = e.getMessage().substring(e.getMessage().indexOf(")-") + 2);
|
|
|
- courseName = courseName.substring(0, courseName.indexOf("("));
|
|
|
- String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
|
|
|
- courseTime = courseTime.substring(0, courseTime.indexOf("至"));
|
|
|
- errMessage = "现在课程:";
|
|
|
- errMessage += courseName;
|
|
|
- errMessage += "<br/>冲突时间:";
|
|
|
- errMessage += courseTime;
|
|
|
- return BaseController.failed(HttpStatus.FOUND, errMessage);
|
|
|
- }
|
|
|
|
|
|
CourseSchedule firstCourseSchedule = newCourses.stream().min(Comparator.comparing(CourseSchedule::getStartClassTime)).get();
|
|
|
if (firstCourseSchedule.getStartClassTime().before(now)) {
|
|
@@ -222,6 +206,22 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
|
|
|
courseSchedule.setCreateTime(now);
|
|
|
courseSchedule.setUpdateTime(now);
|
|
|
}
|
|
|
+ try {
|
|
|
+ courseScheduleService.checkNewCourseSchedules(newCourses, false);
|
|
|
+ } catch (Exception e) {
|
|
|
+ LOGGER.error("检查课程冲突出现异常",e);
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ String errMessage;
|
|
|
+ String courseName = e.getMessage().substring(e.getMessage().indexOf(")-") + 2);
|
|
|
+ courseName = courseName.substring(0, courseName.indexOf("("));
|
|
|
+ String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
|
|
|
+ courseTime = courseTime.substring(0, courseTime.indexOf("至"));
|
|
|
+ errMessage = "现在课程:";
|
|
|
+ errMessage += courseName;
|
|
|
+ errMessage += "<br/>冲突时间:";
|
|
|
+ errMessage += courseTime;
|
|
|
+ return BaseController.failed(HttpStatus.FOUND, errMessage);
|
|
|
+ }
|
|
|
courseScheduleDao.batchAddCourseSchedules(newCourses);
|
|
|
|
|
|
for (CourseSchedule courseSchedule : newCourses) {
|