|
@@ -686,6 +686,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
String star = sysConfigService.findConfigValue(SysConfigConstant.COURSE_START_SETTING);//系统开课时间
|
|
String star = sysConfigService.findConfigValue(SysConfigConstant.COURSE_START_SETTING);//系统开课时间
|
|
String end = sysConfigService.findConfigValue(SysConfigConstant.COURSE_END_SETTING);//系统关课时间
|
|
String end = sysConfigService.findConfigValue(SysConfigConstant.COURSE_END_SETTING);//系统关课时间
|
|
|
|
|
|
|
|
+ LocalDate now = LocalDate.now();
|
|
//获取每日日期数据
|
|
//获取每日日期数据
|
|
while (firstDay.isBefore(lastDay) || firstDay.isEqual(lastDay)) {
|
|
while (firstDay.isBefore(lastDay) || firstDay.isEqual(lastDay)) {
|
|
CourseCalendarEntity entity = new CourseCalendarEntity();
|
|
CourseCalendarEntity entity = new CourseCalendarEntity();
|
|
@@ -699,7 +700,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
.map(t -> getCourseTimeEntity(entity, (JSONObject) t))
|
|
.map(t -> getCourseTimeEntity(entity, (JSONObject) t))
|
|
.filter(f -> checkTime(f, star, end))
|
|
.filter(f -> checkTime(f, star, end))
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
- entity.setCourseTime(timeEntities);
|
|
|
|
|
|
+ if (!now.isAfter(firstDay)) {
|
|
|
|
+ entity.setCourseTime(timeEntities);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
list.add(entity);
|
|
list.add(entity);
|
|
firstDay = firstDay.plusDays(1L);
|
|
firstDay = firstDay.plusDays(1L);
|