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

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

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