|
|
@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupDao;
|
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
import com.ym.mec.biz.dal.dao.TeacherLeaveRecordDao;
|
|
|
import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
|
|
|
import com.ym.mec.biz.dal.entity.Teacher;
|
|
|
import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;
|
|
|
import com.ym.mec.biz.dal.entity.TeacherLeaveRecord.CoursesScheduleHistory;
|
|
|
@@ -82,7 +83,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
|
|
|
List<CourseSchedule> list = new ArrayList<CourseSchedule>();
|
|
|
|
|
|
for (CoursesScheduleHistory his : coursesScheduleHistoryList) {
|
|
|
- if (his.getBefore().getGroupType() == GroupType.MUSIC) {
|
|
|
+ if (his.getBefore().getType() != CourseScheduleType.VIP) {
|
|
|
continue;
|
|
|
}
|
|
|
if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
|
yonge