From eb7fd9040f064acdff132e869865f622f95b4b0a Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Tue, 4 Jul 2023 17:00:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOpenCourseScheduleSession.java | 2 ++ .../ibeetl/jlw/web/CourseInfoController.java | 11 ++++----- .../jlw/web/ResourcesQuestionController.java | 11 ++++----- ...erOpenCourseScheduleSessionController.java | 24 +++++++++++++++---- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index cc800f9b..a6d7e3ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -146,6 +146,8 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ @Dict(type="course_info.course_info_name.1=1") private Long courseInfoId; + private String courseInfoIdText ; + // @FetchSql("select t.* from teacher_open_course_schedule_session_snap t where t.teacher_open_course_schedule_session_snap_status = 1 " + // " and t.teacher_open_course_schedule_session_id = #teacherOpenCourseScheduleSessionId# " + // "and t.teacher_open_course_schedule_session_snap_status = 1 " + diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index 9ab5d019..55192b12 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -346,12 +346,11 @@ public class CourseInfoController { condition.setCourseInfoType(1);//类型(1课程 2章 3节) PageQuery page = condition.getPageQuery(); page.setOrderBy("add_time desc"); -// if (coreUser.isAdmin()){ -// courseInfoService.getCourseDispositionSystemOAndUniversities(page); -// }else { -// courseInfoService.queryByCondition(page); -// } - courseInfoService.queryByCondition(page); + if (coreUser.isAdmin()){ + courseInfoService.getCourseDispositionSystemOAndUniversities(page); + }else { + courseInfoService.queryByCondition(page); + } return JsonResult.success(page); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index 1fe119f4..fba020c5 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -202,12 +202,11 @@ public class ResourcesQuestionController { // 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。 condition.setCourseInfoIds(StrUtil.blankToDefault(ids, "未授权应用")); } -// if (coreUser.isAdmin()) { -// resourcesQuestionService.getTestItemManageSystemOAndUniversities(page); -// } else { -// resourcesQuestionService.queryByCondition(page); -// } - resourcesQuestionService.queryByCondition(page); + if (coreUser.isAdmin()) { + resourcesQuestionService.getTestItemManageSystemOAndUniversities(page); + } else { + resourcesQuestionService.queryByCondition(page); + } return JsonResult.success(page); } 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 3b231095..45aadc91 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.Interceptor.TTeacher; @@ -8,10 +9,9 @@ import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.jlw.entity.Teacher; -import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession; -import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass; -import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions; +import com.ibeetl.jlw.dao.TeacherOpenCourseDao; +import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionDao; +import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.service.*; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery; @@ -48,6 +48,8 @@ public class TeacherOpenCourseScheduleSessionController{ @Autowired private TeacherOpenCourseScheduleSessionService teacherOpenCourseScheduleSessionService; + + @Autowired private TeacherOpenCourseDao teacherOpenCourseDao; @Autowired private TeacherOpenCourseScheduleSessionTagService teacherOpenCourseScheduleSessionTagService; @Autowired private TeacherOpenCourseScheduleSessionClassService teacherOpenCourseScheduleSessionClassService; @Autowired private TeacherOpenCourseScheduleSessionSnapService teacherOpenCourseScheduleSessionSnapService; @@ -392,6 +394,20 @@ public class TeacherOpenCourseScheduleSessionController{ } teacherOpenCourseScheduleSessionService.queryByConditionGroup(page); teacherOpenCourseScheduleSessionSnapService.fullSessionTagList(page.getList()); + if (coreUser.isUniAdmin()){ + page.getList().forEach(item ->{ + TeacherOpenCourseScheduleSession list = (TeacherOpenCourseScheduleSession) item; + if (ObjectUtil.isEmpty(list.getTeacherOpenCourseId())){ + List select = teacherOpenCourseDao.getSQLManager() + .lambdaQuery(TeacherOpenCourse.class) + .andEq(TeacherOpenCourse::getTeacherOpenCourseId, list.getCourseInfoId()) + .select(); + if (!CollectionUtil.isEmpty(select)){ + list.setCourseInfoIdText(select.get(0).getTeacherOpenCourseTitle()); + } + } + }); + } return JsonResult.success(page); } }