|
@@ -325,13 +325,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
|
|
Page<CourseSchedule> courseSchedulePage = new Page<>(req.getPageNo(), req.getPageSize());
|
|
Page<CourseSchedule> courseSchedulePage = new Page<>(req.getPageNo(), req.getPageSize());
|
|
QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
|
|
courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, req.getUserId())
|
|
courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, req.getUserId())
|
|
- .eq(Objects.isNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
|
|
|
|
|
|
+ .eq(Objects.nonNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
|
|
IPage<CourseSchedule> page = courseScheduleService.page(courseSchedulePage, courseScheduleQueryWrapper);
|
|
IPage<CourseSchedule> page = courseScheduleService.page(courseSchedulePage, courseScheduleQueryWrapper);
|
|
BeanUtils.copyProperties(page, pageResult);
|
|
BeanUtils.copyProperties(page, pageResult);
|
|
if (!CollectionUtils.isEmpty(page.getRecords())) {
|
|
if (!CollectionUtils.isEmpty(page.getRecords())) {
|
|
page.getRecords().forEach(courseSchedule -> {
|
|
page.getRecords().forEach(courseSchedule -> {
|
|
TeacherDailyScheduleResp teacherDailyScheduleResp = new TeacherDailyScheduleResp();
|
|
TeacherDailyScheduleResp teacherDailyScheduleResp = new TeacherDailyScheduleResp();
|
|
- teacherDailyScheduleResp.setCourseName(courseSchedule.getName())
|
|
|
|
|
|
+ teacherDailyScheduleResp.setCourseScheduleId(courseSchedule.getId())
|
|
|
|
+ .setCourseName(courseSchedule.getName())
|
|
.setCourseType(CourseSchedule.CourseScheduleType.getMsgByCode(courseSchedule.getType()));
|
|
.setCourseType(CourseSchedule.CourseScheduleType.getMsgByCode(courseSchedule.getType()));
|
|
if (Objects.nonNull(courseSchedule.getStartClassTime()) && Objects.nonNull(courseSchedule.getEndClassTime())) {
|
|
if (Objects.nonNull(courseSchedule.getStartClassTime()) && Objects.nonNull(courseSchedule.getEndClassTime())) {
|
|
teacherDailyScheduleResp.setClassTime(DateUtil.time2String(courseSchedule.getStartClassTime()) + "-" +
|
|
teacherDailyScheduleResp.setClassTime(DateUtil.time2String(courseSchedule.getStartClassTime()) + "-" +
|