1、课程实训案例管理-资源库选择

web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java

@@ -21,6 +21,14 @@ import java.util.List;
 public interface ResourcesInfoDao extends BaseMapper<ResourcesInfo>{
     PageQuery<ResourcesInfo> queryByCondition(PageQuery query);
 
+
+    /**
+     * 获取资源库资源（系统授权课程+开课课程）
+     * @param query
+     * @return
+     */
+    PageQuery<ResourcesInfo> getResourceSystemOAndUniversities(PageQuery query);
+
     /**
      * 获取课程资源管理列表
      * @param query

web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java

@@ -107,6 +107,16 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
         return ret;
     }
 
+    /**
+     * 获取资源库资源（系统授权课程+开课课程）
+     *
+     * @param query
+     * @return
+     */
+    public PageQuery<ResourcesInfo> getResourceSystemOAndUniversities(PageQuery query) {
+        return resourcesInfoDao.getResourceSystemOAndUniversities(query);
+    }
+
     /**
      * 获取课程资源管理列表
      *

web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java

@@ -345,6 +345,17 @@ public class ResourcesInfoController {
         return JsonResult.success(page);
     }
 
+
+    @PostMapping(MODEL + "/getResourceSystemOAndUniversitiesList.json")
+    @ResponseBody
+    public JsonResult<PageQuery> getResourceSystemOAndUniversities(ResourcesInfoQuery condition, @SCoreUser CoreUser coreUser) {
+        PageQuery page = condition.getPageQuery();
+        condition.setOrgId(ObjectUtil.isNull(coreUser.getOrgId()) ? null : coreUser.getOrgId());
+        condition.setResourcesInfoStatus(1);
+        resourcesInfoService.getResourceSystemOAndUniversities(page);
+        return JsonResult.success(page);
+    }
+
     @PostMapping(MODEL + "/getCurriculumResourceManagementList.json")
     @ResponseBody
     public JsonResult<PageQuery> getCurriculumResourceManagementList(ResourcesInfoQuery condition, @SCoreUser CoreUser coreUser) {

web/src/main/resources/sql/jlw/resourcesInfo.md

@@ -590,4 +590,98 @@ getCurriculumResourceManagementList
   @if(!isEmpty(orgId)){
   AND tt.org_id = #orgId#
   @}
-  ORDER BY tt.add_time DESC
+  ORDER BY tt.add_time DESC
+
+
+getResourceSystemOAndUniversities
+===
+
+* 获取课程资源管理系统授权课+院校开课
+
+SELECT
+@pageTag(){
+tt.*
+@}
+FROM
+(
+(
+SELECT
+a.add_time,
+aa.course_info_id,
+aa.course_info_name,
+ab.course_info_id AS course_info_parent_id,
+ab.course_info_name AS course_info_parent_name,
+ac.course_info_id AS course_info_parent_parent_id,
+ac.course_info_name AS course_info_parent_parent_name,
+a.order_index,
+a.org_id,
+a.resources_info_content,
+a.resources_info_files,
+a.resources_info_id,
+a.resources_info_name,
+a.resources_info_status,
+a.resources_info_type,
+'2' AS source_type
+FROM
+resources_info a
+LEFT JOIN course_info aa ON aa.course_info_id = a.course_info_id
+LEFT JOIN course_info ab ON ab.course_info_id = aa.course_info_parent_id
+LEFT JOIN course_info ac ON ac.course_info_id = ab.course_info_parent_id
+LEFT JOIN course_label ad ON ad.course_label_id = ac.course_label_id
+@if(!isEmpty(orgId)){
+LEFT JOIN universities_colleges_jurisdiction_curriculum_resources af ON af.course_info_id = ac.course_info_id
+@}
+WHERE
+ad.course_label_type = '理论课程类'
+@if(!isEmpty(orgId)){
+AND af.org_id = #orgId#
+AND af.use_type IN(1,2)
+AND af.use_end_time >= NOW()
+@}
+)
+
+UNION ALL
+
+(
+SELECT
+b.add_time,
+ba.teacher_open_course_merge_course_info_id,
+ba.course_info_name,
+bb.teacher_open_course_merge_course_info_id AS course_info_parent_id,
+bb.course_info_name AS course_info_parent_name,
+bc.teacher_open_course_id AS course_info_parent_parent_id,
+bc.teacher_open_course_title AS course_info_parent_parent_name,
+b.order_index,
+b.org_id,
+b.resources_info_content,
+b.resources_info_files,
+b.teacher_open_course_merge_resources_info_id,
+b.resources_info_name,
+b.resources_info_status,
+b.resources_info_type,
+'1' AS source_type
+FROM
+teacher_open_course_merge_resources_info b
+LEFT JOIN teacher_open_course_merge_course_info ba ON ba.teacher_open_course_merge_course_info_id = b.teacher_open_course_merge_course_info_id
+LEFT JOIN teacher_open_course_merge_course_info bb ON bb.teacher_open_course_merge_course_info_id = ba.course_info_parent_id
+LEFT JOIN teacher_open_course bc ON bc.teacher_open_course_id = b.teacher_open_course_id
+WHERE
+bc.teacher_open_course_status = 1
+@if(!isEmpty(orgId)){
+AND b.org_id = #orgId#
+@}
+
+)
+) tt
+WHERE
+1=1
+AND (tt.resources_info_status = 1 OR ISNULL(tt.resources_info_status))
+@if(!isEmpty(resourcesInfoTypePlural)){
+AND FIND_IN_SET(tt.resources_info_type,#resourcesInfoTypePlural#)
+@}
+@if(!isEmpty(courseInfoId_0)){
+AND tt.course_info_parent_parent_id = #courseInfoId_0#
+@}
+@if(!isEmpty(resourcesInfoName)){
+AND tt.resources_info_name LIKE #'%'+resourcesInfoName+'%'#
+@}