1、课程调整提示信息修改

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

@@ -924,18 +924,30 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
 					Date courseEndTime = DateUtil.addMinutes(courseStartTime,vipGroup.getSingleClassMinutes());
 					courseStartDates.add(DateUtil.stringToDate(dateYmdStr, DateUtil.EXPANDED_DATE_TIME_FORMAT));
-					courseSchedules.get(courseStartDates.size()-1).setStatus(CourseStatusEnum.NOT_START);
-					courseSchedules.get(courseStartDates.size()-1).setClassDate(courseStartTime);
-					courseSchedules.get(courseStartDates.size()-1).setStartClassTime(courseStartTime);
-					courseSchedules.get(courseStartDates.size()-1).setEndClassTime(courseEndTime);
 					int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(courseSchedules.get(courseStartDates.size()-1).getId().intValue());
 					if(settlementNum>0){
-						throw new BizException("选择的课程中存在已结算的课程");
+						throw new BizException("{}[{}]{}-{}课程已结算的",
+								courseSchedules.get(courseStartDates.size()-1).getName(),
+								courseSchedules.get(courseStartDates.size()-1).getId(),
+								DateUtil.dateToString(courseSchedules.get(courseStartDates.size()-1).getStartClassTime(),
+										DateUtil.ISO_EXPANDED_DATE_TIME_FORMAT),
+								DateUtil.dateToString(courseSchedules.get(courseStartDates.size()-1).getEndClassTime(),
+										DateUtil.ISO_EXPANDED_DATE_TIME_FORMAT));
 					}
 					int num=studentAttendanceDao.countStudentAttendenceNum(courseSchedules.get(courseStartDates.size()-1).getId().intValue());
 					if(num>0){
-						throw new BizException("选择的课程中存在已经点名的课程");
+						throw new BizException("{}[{}]{}-{}课程已点名",
+								courseSchedules.get(courseStartDates.size()-1).getName(),
+								courseSchedules.get(courseStartDates.size()-1).getId(),
+								DateUtil.dateToString(courseSchedules.get(courseStartDates.size()-1).getStartClassTime(),
+										DateUtil.EXPANDED_DATE_TIME_FORMAT),
+								DateUtil.dateToString(courseSchedules.get(courseStartDates.size()-1).getEndClassTime(),
+										DateUtil.EXPANDED_DATE_TIME_FORMAT));
 					}
+					courseSchedules.get(courseStartDates.size()-1).setStatus(CourseStatusEnum.NOT_START);
+					courseSchedules.get(courseStartDates.size()-1).setClassDate(courseStartTime);
+					courseSchedules.get(courseStartDates.size()-1).setStartClassTime(courseStartTime);
+					courseSchedules.get(courseStartDates.size()-1).setEndClassTime(courseEndTime);
 				}
 				if(courseStartDates.size()==courseScheduleIds.size()){
 					break;
@@ -985,6 +997,26 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
 			}
 			if(oldCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
+				int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
+				if(settlementNum>0){
+					throw new BizException("{}[{}]{}-{}课程已结算的",
+							oldCourseSchedule.getName(),
+							oldCourseSchedule.getId(),
+							DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
+									DateUtil.EXPANDED_DATE_TIME_FORMAT),
+							DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
+									DateUtil.EXPANDED_DATE_TIME_FORMAT));
+				}
+				int num=studentAttendanceDao.countStudentAttendenceNum(oldCourseSchedule.getId().intValue());
+				if(num>0){
+					throw new BizException("{}[{}]{}-{}课程已点名",
+							oldCourseSchedule.getName(),
+							oldCourseSchedule.getId(),
+							DateUtil.dateToString(oldCourseSchedule.getStartClassTime(),
+							DateUtil.EXPANDED_DATE_TIME_FORMAT),
+							DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
+									DateUtil.EXPANDED_DATE_TIME_FORMAT));
+				}
 				VipGroup vipGroup=vipGroupDao.get(Long.valueOf(oldCourseSchedule.getMusicGroupId()));
 				Date endClassTime = DateUtil.addMinutes(newCourseSchedule.getStartClassTime(),vipGroup.getSingleClassMinutes());
 				newCourseSchedule.setEndClassTime(endClassTime);