|
|
@@ -8,10 +8,12 @@ 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;
|
|
|
import com.ym.mec.biz.dal.enums.AuditStatusEnum;
|
|
|
+import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
import com.ym.mec.biz.dal.enums.MessageTypeEnum;
|
|
|
import com.ym.mec.biz.service.CourseScheduleService;
|
|
|
import com.ym.mec.biz.service.SysMessageService;
|
|
|
@@ -22,6 +24,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.ym.mec.util.date.DateUtil;
|
|
|
import com.ym.mec.util.json.JsonUtil;
|
|
|
+
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -80,7 +83,9 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
|
|
|
List<CourseSchedule> list = new ArrayList<CourseSchedule>();
|
|
|
|
|
|
for (CoursesScheduleHistory his : coursesScheduleHistoryList) {
|
|
|
-
|
|
|
+ if (his.getBefore().getType() != CourseScheduleType.VIP) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
|
|
|
&&!teacherLeaveRecord.getStartTime().after(his.getAfter().getEndClassTime())){
|
|
|
throw new BizException("课程时间与老师请假时间存在冲突");
|
zouxuan