From 9d29f6ec99f105ca7df1f0c140fbd254b07caaa8 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 11 Nov 2022 00:25:58 +0800 Subject: [PATCH] 1 --- ...erOpenCourseScheduleSessionController.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index 90f214e8..b93ca359 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -117,24 +117,25 @@ public class TeacherOpenCourseScheduleSessionController{ @ResponseBody public ModelAndView add(Long teacherOpenCourseScheduleSessionId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScheduleSession/add.html"); + // 公共查询 + // 课次标签列表 + TeacherOpenCourseScheduleSessionTagQuery param = new TeacherOpenCourseScheduleSessionTagQuery(); + view.addObject("sessionTagList", teacherOpenCourseScheduleSessionTagService.getValuesByQuery(param)); + + // 教室列表 + TeacherOpenCourseScheduleSessionClassQuery classQuery = new TeacherOpenCourseScheduleSessionClassQuery(); + List valuesByQuery = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(classQuery); + valuesByQuery.forEach(item -> { + // 教室 全路径的名称 + String sessionClassFullName = teacherOpenCourseScheduleSessionClassService + .getSessionClassFullName(item.getTeacherOpenCourseScheduleSessionClassId(), valuesByQuery); + item.set("scheduleSessionClassFullName", sessionClassFullName); + }); + view.addObject("sessionTagList", valuesByQuery); + if(null != teacherOpenCourseScheduleSessionId){ TeacherOpenCourseScheduleSession teacherOpenCourseScheduleSession = teacherOpenCourseScheduleSessionService.queryById(teacherOpenCourseScheduleSessionId); view.addObject("teacherOpenCourseScheduleSession", teacherOpenCourseScheduleSession); - - // 课次标签列表 - TeacherOpenCourseScheduleSessionTagQuery param = new TeacherOpenCourseScheduleSessionTagQuery(); - view.addObject("sessionTagList", teacherOpenCourseScheduleSessionTagService.getValuesByQuery(param)); - - // 教室列表 - TeacherOpenCourseScheduleSessionClassQuery classQuery = new TeacherOpenCourseScheduleSessionClassQuery(); - List valuesByQuery = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(classQuery); - valuesByQuery.forEach(item -> { - // 教室 全路径的名称 - String sessionClassFullName = teacherOpenCourseScheduleSessionClassService - .getSessionClassFullName(item.getTeacherOpenCourseScheduleSessionClassId(), valuesByQuery); - item.set("scheduleSessionClassFullName", sessionClassFullName); - }); - view.addObject("sessionTagList", valuesByQuery); }else { view.addObject("teacherOpenCourseScheduleSession", new TeacherOpenCourseScheduleSession()); view.addObject("sessionTagList", Lists.emptyList());