|
@@ -2276,20 +2276,19 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
DateUtil.dateToString(oldCourseSchedule.getEndClassTime(),
|
|
|
DateUtil.EXPANDED_DATE_TIME_FORMAT));
|
|
|
}
|
|
|
- //学生已点名不能调整(请假可以调整)
|
|
|
- List<StudentAttendance> studentAttendanceList = studentAttendanceDao.findByCourseId(oldCourseSchedule.getId());
|
|
|
|
|
|
- for(StudentAttendance studentAttendance : studentAttendanceList){
|
|
|
- if(studentAttendance.getStatus() != StudentAttendanceStatusEnum.LEAVE){
|
|
|
- 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));
|
|
|
- }
|
|
|
- }
|
|
|
+ if (newCourseSchedule.getGroupType() != GroupType.COMM) {
|
|
|
+ // 学生已点名不能调整(请假可以调整)
|
|
|
+ List<StudentAttendance> studentAttendanceList = studentAttendanceDao.findByCourseId(oldCourseSchedule.getId());
|
|
|
+
|
|
|
+ for (StudentAttendance studentAttendance : studentAttendanceList) {
|
|
|
+ if (studentAttendance.getStatus() != StudentAttendanceStatusEnum.LEAVE) {
|
|
|
+ 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));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if(!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())){
|
|
|
if (newCourseSchedule.getTeachingTeacherIdList().contains(newCourseSchedule.getActualTeacherId())){
|