|
@@ -2945,7 +2945,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaries);
|
|
courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaries);
|
|
}
|
|
}
|
|
|
|
|
|
- checkNewCourseSchedules(oldCourses, false, false);
|
|
|
|
|
|
+ try {
|
|
|
|
+ checkNewCourseSchedules(oldCourses, false, false);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ String errMessage = e.getMessage();
|
|
|
|
+ if (errMessage.equals("您设置的循环周期存在时间冲突")) {
|
|
|
|
+ errMessage = "日期相同课程不可批量调整上课时间";
|
|
|
|
+ }
|
|
|
|
+ return BaseController.failed(HttpStatus.INTERNAL_SERVER_ERROR, errMessage);
|
|
|
|
+ }
|
|
|
|
|
|
if (!courseAdjustInfo.getConfirmGenerate()) {
|
|
if (!courseAdjustInfo.getConfirmGenerate()) {
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|