|
|
@@ -1369,9 +1369,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
//未来30天日期-跳过节假日
|
|
|
List<String> futureDaysNoVacation = futureDays.stream().filter(item -> !holiday.contains(item)).collect(Collectors.toList());
|
|
|
|
|
|
- //查询所有老师未开始、进行中的课程
|
|
|
-// List<String> statusList = Lists.newArrayList(CourseScheduleEnum.NOT_START.getCode(), CourseScheduleEnum.ING.getCode());
|
|
|
-
|
|
|
List<Long> teacherIdList = new ArrayList<>();
|
|
|
getAllTimeConfig(skipHoliday, futureDaysNoVacation, teacherIdList);//跳过节假日配置
|
|
|
getAllTimeConfig(noSkipHoliday, futureDays, teacherIdList);//未跳过节假日配置
|
|
|
@@ -1397,11 +1394,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
.in(CourseSchedule::getStatus, statusList)
|
|
|
.gt(CourseSchedule::getClassDate, DateUtil.getNowStr()));
|
|
|
|
|
|
-// if (CollectionUtils.isEmpty(scheduleList)) {//无人购课直接跳出本次循环
|
|
|
-// idList.add(freeTimeConfig.getTeacherId());
|
|
|
-// continue;
|
|
|
-// }
|
|
|
-
|
|
|
//获取一周配置格式化
|
|
|
List<DateVo> monday = JSONObject.parseArray(freeTimeConfig.getMonday(), DateVo.class);
|
|
|
List<DateVo> tuesday = JSONObject.parseArray(freeTimeConfig.getTuesday(), DateVo.class);
|
cy