浏览代码

feat:课表列表新增调整

Joburgess 4 年之前
父节点
当前提交
dfc78fc2e0
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

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

@@ -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();