|
|
|
@ -43,6 +43,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import static cn.hutool.core.collection.CollUtil.join;
|
|
|
|
|
import static cn.hutool.core.date.DatePattern.NORM_DATE_PATTERN;
|
|
|
|
|
import static cn.hutool.core.date.DateUtil.offsetDay;
|
|
|
|
|
import static cn.hutool.core.date.DateUtil.parseDate;
|
|
|
|
|
import static com.ibeetl.admin.core.util.DateUtil.weekNumberInList;
|
|
|
|
|
import static java.util.stream.Collectors.groupingBy;
|
|
|
|
@ -239,7 +240,8 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
|
|
|
|
|
// 偏移周
|
|
|
|
|
DateTime startTime = parseDate(options.getStartTime());
|
|
|
|
|
DateTime endTime = DateUtil.offsetWeek(startTime, options.getWeekNum());
|
|
|
|
|
List<DateTime> dateTimes = DateUtil.rangeToList(startTime, endTime, DateField.DAY_OF_YEAR);
|
|
|
|
|
// 结束时间向前偏移一天
|
|
|
|
|
List<DateTime> dateTimes = DateUtil.rangeToList(startTime, offsetDay(endTime, -1), DateField.DAY_OF_YEAR);
|
|
|
|
|
|
|
|
|
|
// 开课星期,排序。数据直观一些
|
|
|
|
|
List<Object> sortWeekDetail = options.getWeekDetail().stream().sorted().collect(Collectors.toList());
|
|
|
|
|