diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java index dc4c455e..f28f9772 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java @@ -69,6 +69,7 @@ public class ResourcesInfo extends BaseEntity { @InsertIgnore private Date addTime; + private String courseInfoName; private Long courseInfoParentId; private String courseInfoParentName; private Long courseInfoParentParentId; @@ -252,4 +253,12 @@ public class ResourcesInfo extends BaseEntity { public void setAddTypeText(String addTypeText) { this.addTypeText = addTypeText; } + + public String getCourseInfoName() { + return courseInfoName; + } + + public void setCourseInfoName(String courseInfoName) { + this.courseInfoName = courseInfoName; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index 2d0ae0c6..a5315363 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -403,9 +403,15 @@ public class CourseInfoService extends CoreBaseService { List courseInfoList; - if (Objects.equals(courseInfoQuery.getSourceType(), 1)) { - //院校开课 + List courseList = courseInfoDao.getSQLManager() + .lambdaQuery(CourseInfo.class) + .andEq(CourseInfo::getCourseInfoParentId, courseInfoQuery.getCourseInfoParentId()) + .andEq(CourseInfo::getCourseInfoType, courseInfoQuery.getCourseInfoType()) + .select(); + + if (CollectionUtil.isEmpty(courseList)) { courseInfoList = new ArrayList<>(); + LambdaQuery courseInfoLambdaQuery = teacherOpenCourseMergeCourseInfoDao.getSQLManager().lambdaQuery(TeacherOpenCourseMergeCourseInfo.class); if (Objects.equals(courseInfoQuery.getCourseInfoType(), 2)) { courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseId, courseInfoQuery.getCourseInfoParentId()); @@ -413,8 +419,8 @@ public class CourseInfoService extends CoreBaseService { courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, courseInfoQuery.getCourseInfoParentId()); } courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, courseInfoQuery.getCourseInfoType()); - courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1); List select = courseInfoLambdaQuery.select(); + select.forEach(item -> { CourseInfo course = new CourseInfo(); course.setAddTime(item.getAddTime()); @@ -427,9 +433,8 @@ public class CourseInfoService extends CoreBaseService { }); } else { - //系统授权课 courseInfoList = new ArrayList<>(); - courseInfoDao.getValuesQuery(courseInfoQuery).forEach(item -> { + courseList.forEach(item -> { CourseInfo course = new CourseInfo(); course.setAddTime(item.getAddTime()); course.setCourseInfoId(item.getCourseInfoId()); diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java index 6179fe72..74b66b7b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java @@ -13,9 +13,11 @@ import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.CourseInfoDao; import com.ibeetl.jlw.dao.ResourcesInfoDao; +import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao; import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesInfoDao; import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.ResourcesInfo; +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo; import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import com.ibeetl.jlw.enums.MoveEnum; @@ -60,6 +62,8 @@ public class ResourcesInfoService extends CoreBaseService { @Autowired private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao; + @Autowired + private TeacherOpenCourseMergeCourseInfoDao teacherOpenCourseMergeCourseInfoDao; public PageQuery queryByCondition(PageQuery query) { @@ -110,7 +114,49 @@ public class ResourcesInfoService extends CoreBaseService { * @return */ public PageQuery getCurriculumResourceManagementList(PageQuery query) { - return resourcesInfoDao.getCurriculumResourceManagementList(query); + List list = resourcesInfoDao.getCurriculumResourceManagementList(query).getList(); + list.forEach(item ->{ + + CourseInfo course = courseInfoDao.getSQLManager() + .lambdaQuery(CourseInfo.class) + .andEq(CourseInfo::getCourseInfoId,item.getCourseInfoId()) + .single(); + + if (ObjectUtil.isNull(course)) { + //获取小节 + TeacherOpenCourseMergeCourseInfo noduleCourseInfo = teacherOpenCourseMergeCourseInfoDao.getSQLManager() + .lambdaQuery(TeacherOpenCourseMergeCourseInfo.class) + .andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId,item.getCourseInfoId()) + .single(); + if (!Objects.isNull(noduleCourseInfo)) { + item.setCourseInfoId(noduleCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); + item.setCourseInfoName(noduleCourseInfo.getCourseInfoName()); + + //获取章节 + TeacherOpenCourseMergeCourseInfo chapterCourseInfo = teacherOpenCourseMergeCourseInfoDao.getSQLManager() + .lambdaQuery(TeacherOpenCourseMergeCourseInfo.class) + .andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId,noduleCourseInfo.getCourseInfoParentId()) + .single(); + if (!Objects.isNull(chapterCourseInfo)) { + item.setCourseInfoParentId(chapterCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); + item.setCourseInfoParentName(chapterCourseInfo.getCourseInfoName()); + + //获取课程 + TeacherOpenCourseMergeCourseInfo courseInfo = teacherOpenCourseMergeCourseInfoDao.getSQLManager() + .lambdaQuery(TeacherOpenCourseMergeCourseInfo.class) + .andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId,chapterCourseInfo.getCourseInfoParentId()) + .single(); + if (!Objects.isNull(courseInfo)) { + item.setCourseInfoParentParentId(courseInfo.getTeacherOpenCourseId()); + item.setCourseInfoParentParentName(courseInfo.getCourseInfoName()); + } + } + } + } + }); + PageQuery pageQuery = new PageQuery<>(); + pageQuery.setList(list); + return pageQuery; } public ResourcesInfo getById(Long resourcesInfoId) { diff --git a/web/src/main/resources/sql/jlw/resourcesInfo.md b/web/src/main/resources/sql/jlw/resourcesInfo.md index a061c75e..34cc2ba0 100644 --- a/web/src/main/resources/sql/jlw/resourcesInfo.md +++ b/web/src/main/resources/sql/jlw/resourcesInfo.md @@ -246,14 +246,14 @@ getCurriculumResourceManagementList @if(!isEmpty(resourcesInfoName)) { AND tt.resources_info_name LIKE #'%'+resourcesInfoName+'%'# @} + @if(!isEmpty(courseInfoId_0)) { + AND tt.course_info_parent_parent_id = #courseInfoId_0# + @} @if(!isEmpty(courseInfoId_1)) { - AND tt.course_info_parent_parent_id = #courseInfoId_1# + AND tt.course_info_parent_id = #courseInfoId_1# @} @if(!isEmpty(courseInfoId_2)) { - AND tt.course_info_parent_id = #courseInfoId_2# - @} - @if(!isEmpty(courseInfoId_3)) { - AND tt.course_info_id = #courseInfoId_3# + AND tt.course_info_id = #courseInfoId_2# @} @if(!isEmpty(addTypeText)) { AND tt.add_type_text LIKE #'%'+addTypeText+'%'# diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js index 3d915ffa..efdfaacd 100644 --- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js @@ -103,7 +103,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { method: 'post', even: true, size: "lg", - url: Common.ctxPath + '/jlw/resourcesInfo/list.json' // 数据接口 + url: Common.ctxPath + '/jlw/resourcesInfo/getCurriculumResourceManagementList.json' // 数据接口 , page: Lib.tablePage // 开启分页 , limit: 10, cols: [[ // 表头