diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index cd3a6e22..6d34e9df 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -72,4 +72,7 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends * @return */ List getAuthorizedCourse(Long orgId, String courseLabelIdPlural); + + + PageQuery queryAllAuthCourseInfoAndOpenCourse(PageQuery query); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index 2156be33..8042de56 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -51,6 +51,12 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends queryListAfter(ret.getList()); return ret; } + public PageQuery queryAllAuthCourseInfoAndOpenCourse(PageQuery query) { + PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryAllAuthCourseInfoAndOpenCourse(query); + queryListAfter(ret.getList()); + return ret; + } + public void deleteUniversitiesCollegesJurisdictionCurriculumResources(String ids) { try { diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java index 47633ae0..82931203 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -143,21 +143,42 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ } + //@PostMapping(MODEL + "/listWithCourseInfo.json") + //@Function("universitiesCollegesJurisdictionCurriculumResources.query") + //@ResponseBody + //public JsonResult listWithCourseInfo(UniversitiesCollegesJurisdictionCurriculumResourcesQuery condition, @SCoreUser CoreUser coreUser){ + // PageQuery page = condition.getPageQuery(); + // + // // 如果是院校，则查询这个院校的ID + // if (coreUser.isUniAdmin()) { + // UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); + // if (uc != null) { + // condition.setUniversitiesCollegesId(defaultIfNull(condition.getUniversitiesCollegesId(), uc.getUniversitiesCollegesId())); + // } + // } + // universitiesCollegesJurisdictionCurriculumResourcesService.queryAllAuthCourseInfoByCondition(page); + // return JsonResult.success(page); + //} + + @PostMapping(MODEL + "/listWithCourseInfo.json") @Function("universitiesCollegesJurisdictionCurriculumResources.query") @ResponseBody public JsonResult listWithCourseInfo(UniversitiesCollegesJurisdictionCurriculumResourcesQuery condition, @SCoreUser CoreUser coreUser){ - PageQuery page = condition.getPageQuery(); - - // 如果是院校，则查询这个院校的ID if (coreUser.isUniAdmin()) { - UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); - if (uc != null) { - condition.setUniversitiesCollegesId(defaultIfNull(condition.getUniversitiesCollegesId(), uc.getUniversitiesCollegesId())); - } + condition.setOrgId(coreUser.getOrgId()); } - universitiesCollegesJurisdictionCurriculumResourcesService.queryAllAuthCourseInfoByCondition(page); - return JsonResult.success(page); + PageQuery page = condition.getPageQuery(); + + //// 如果是院校，则查询这个院校的ID + //if (coreUser.isUniAdmin()) { + // UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); + // if (uc != null) { + // condition.setUniversitiesCollegesId(defaultIfNull(condition.getUniversitiesCollegesId(), uc.getUniversitiesCollegesId())); + // } + //} + PageQuery courseInfoPageQuery = universitiesCollegesJurisdictionCurriculumResourcesService.queryAllAuthCourseInfoAndOpenCourse(page); + return JsonResult.success(courseInfoPageQuery); } @PostMapping(MODEL + "/add.json") diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md index 974f5155..d6a2d8df 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md @@ -204,6 +204,114 @@ queryAllAuthCourseInfoByCondition @} ) tt + +queryAllAuthCourseInfoAndOpenCourse +=== + * 查询所有授权的课程和本校自己上传的课程 + select + @pageTag(){ + * + @} + from + (( + select + 1 `universities_colleges_jurisdiction_curriculum_resources_id`, + 2 `type`, + t.use_type, + t.use_start_time, + t.use_end_time, + ta.`course_info_id`, + ta.course_info_name, + tc.course_label_type, + tc.course_label_name, + ta.`add_time` + from course_info ta + left join course_label tc on tc.course_label_id = ta.course_label_id + join universities_colleges_jurisdiction_curriculum_resources t on ta.course_info_id = t.course_info_id + left join universities_colleges tb on tb.universities_colleges_id = t.universities_colleges_id + where 1 = 1 + and tb.universities_colleges_status = 1 + and tc.course_label_status = 1 + AND ta.course_info_status = 1 + AND ta.course_info_type = 1 + AND tc.course_label_type = '理论课程类' + @if(!isEmpty(universitiesCollegesJurisdictionCurriculumResourcesId)){ + and t.universities_colleges_jurisdiction_curriculum_resources_id =#universitiesCollegesJurisdictionCurriculumResourcesId# + @} + @if(!isEmpty(universitiesCollegesId)){ + and t.universities_colleges_id =#universitiesCollegesId# + @} + @if(!isEmpty(type)){ + and t.type =#type# + @} + @if(!isEmpty(useTypePlural)){ + and find_in_set(t.use_type, #useTypePlural#) + @} + @if(!isEmpty(courseInfoId)){ + and t.course_info_id =#courseInfoId# + @} + @if(!isEmpty(courseInfoName)){ + and ta.course_info_name like #'%'+courseInfoName+'%'# + @} + @if(!isEmpty(typeId)){ + and t.type_id =#typeId# + @} + @if(!isEmpty(useType)){ + and t.use_type =#useType# + @} + @if(!isEmpty(useStartTime)){ + and t.use_start_time =#useStartTime# + @} + @if(!isEmpty(useEndTime)){ + and t.use_end_time =#useEndTime# + @} + @if(!isEmpty(secondLevelName)){ + and t.second_level_name =#secondLevelName# + @} + @if(!isEmpty(secondLevelLogo)){ + and t.second_level_logo =#secondLevelLogo# + @} + @if(!isEmpty(addTime)){ + and t.add_time =#addTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(universitiesCollegesJurisdictionExperimentalSystemId)){ + and t.universities_colleges_jurisdiction_experimental_system_id =#universitiesCollegesJurisdictionExperimentalSystemId# + @} + ) + UNION ALL + ( + SELECT + 1 `universities_colleges_jurisdiction_curriculum_resources_id`, + 1 `type`, + 3 `use_type`, + null `use_start_time`, + null `use_end_time`, + a.teacher_open_course_id `course_info_id`, + a.teacher_open_course_title `course_info_name`, + '院校' `course_label_type`, + '开课类' `course_label_name`, + a.create_time `add_time` + FROM teacher_open_course a + LEFT JOIN teacher_open_course_merge_teacher tocmt on a.teacher_open_course_id = tocmt.teacher_open_course_id + LEFT JOIN teacher t on t.teacher_id = tocmt.teacher_id + WHERE 1 = 1 + AND a.teacher_open_course_status = 1 + AND tocmt.teacher_open_course_merge_teacher_status=1 + AND t.teacher_status=1 + @if(!isEmpty(orgId)){ + AND a.org_id =#orgId# + @} + + ) + ) tt + + deleteUniversitiesCollegesJurisdictionCurriculumResourcesByIds === diff --git a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionCurriculumResources/index.js b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionCurriculumResources/index.js index cc04c862..051a21a1 100644 --- a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionCurriculumResources/index.js +++ b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionCurriculumResources/index.js @@ -1,54 +1,54 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { +layui.define(['form', 'laydate', 'table'], function (exports) { var form = layui.form; var laydate = layui.laydate; var table = layui.table; var universitiesCollegesJurisdictionCurriculumResourcesTable = null; - var view ={ - init:function(){ + var view = { + init: function () { this.initTable(); this.initSearchForm(); this.initToolBar(); - window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),universitiesCollegesJurisdictionCurriculumResourcesTable) + window.dataReload = function () { + Lib.doSearchForm($("#searchForm"), universitiesCollegesJurisdictionCurriculumResourcesTable) } }, - initTable:function(){ + initTable: function () { universitiesCollegesJurisdictionCurriculumResourcesTable = table.render({ - elem : '#universitiesCollegesJurisdictionCurriculumResourcesTable', - height : Lib.getTableHeight(1), + elem: '#universitiesCollegesJurisdictionCurriculumResourcesTable', + height: Lib.getTableHeight(1), cellMinWidth: 100, - method : 'post', - size:"lg", + method: 'post', + size: "lg", // url : Common.ctxPath + '/jlw/universitiesCollegesJurisdictionCurriculumResources/list.json' // 数据接口 - url : Common.ctxPath + '/jlw/universitiesCollegesJurisdictionCurriculumResources/listWithCourseInfo.json?useTypePlural=1,2' // 数据接口 - ,page : Lib.tablePage // 开启分页 - ,limit : 10, - cols : [ [ // 表头 + url: Common.ctxPath + '/jlw/universitiesCollegesJurisdictionCurriculumResources/listWithCourseInfo.json?useTypePlural=1,2' // 数据接口 + , page: Lib.tablePage // 开启分页 + , limit: 10, + cols: [[ // 表头 { - type : 'checkbox', - fixed:'left', + type: 'checkbox', + fixed: 'left', }, // { // field : 'universitiesCollegesName', // title : '院校名称', // }, { - field : 'courseInfoName', - title : '课程名称', + field: 'courseInfoName', + title: '课程名称', }, { - field : 'courseLabelType', - title : '课程类别', + field: 'courseLabelType', + title: '课程类别', }, { - field : 'courseLabelName', - title : '课程标签', + field: 'courseLabelName', + title: '课程标签', }, { - field : 'userId', - title : '课程来源', + field: 'type', + title: '课程来源', templet: function (d) { - if(d.userId == null || d.userId == 1) { + if (d.type == 2) { return '系统授权' } else { return '院校添加' @@ -56,33 +56,29 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, }, { - field : 'useType', - title : '使用级别', + field: 'useType', + title: '使用级别', templet: function (d) { - return d.useType === 0 ? '不使用' - : d.useType === 1 ? '购买' - : d.useType === 2 ? '试用' - // 默认试用,会有一些课程，在清单中，但不属于授权的 - : '试用'; + return d.useType === 0 ? '不使用' : (d.useType === 1 ? '购买' : (d.useType === 2 ? '试用' : (d.useType === 3 ? '-' : '试用'))); }, }, { - field : 'useStartTime', - title : '开始时间', + field: 'useStartTime', + title: '开始时间', templet: function (d) { - return d.useStartTime ? d.useStartTime : '-' + return d.useStartTime ? d.useStartTime : '-' }, }, { - field : 'useEndTime', - title : '结束时间', + field: 'useEndTime', + title: '结束时间', templet: function (d) { - return d.useEndTime ? d.useEndTime : '-' + return d.useEndTime ? d.useEndTime : '-' }, }, { - field : '_endStatus_', - title : '到期状态', + field: '_endStatus_', + title: '到期状态', templet: function (d) { // 默认在用,会有一些课程，在清单中，但不属于授权的 if (!d.useEndTime) { @@ -97,42 +93,42 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, }, { - field : 'addTime', - title : '添加时间', + field: 'addTime', + title: '添加时间', } - ] ] + ]] }); - table.on('checkbox(universitiesCollegesJurisdictionCurriculumResourcesTable)', function(obj){ + table.on('checkbox(universitiesCollegesJurisdictionCurriculumResourcesTable)', function (obj) { var universitiesCollegesJurisdictionCurriculumResources = obj.data; - if(obj.checked){ + if (obj.checked) { //按钮逻辑Lib.buttonEnable() - }else{ + } else { } }) }, - initSearchForm:function(){ - Lib.initSearchForm( $("#searchForm"),universitiesCollegesJurisdictionCurriculumResourcesTable,form); + initSearchForm: function () { + Lib.initSearchForm($("#searchForm"), universitiesCollegesJurisdictionCurriculumResourcesTable, form); }, - initToolBar:function(){ + initToolBar: function () { toolbar = { - add : function() { // 获取选中数据 + add: function () { // 获取选中数据 var url = "/jlw/universitiesCollegesJurisdictionCurriculumResources/add.do"; - Common.openDlg(url,"UniversitiesCollegesJurisdictionCurriculumResources管理>新增"); + Common.openDlg(url, "UniversitiesCollegesJurisdictionCurriculumResources管理>新增"); }, - edit : function() { // 获取选中数目 - var data = Common.getOneFromTable(table,"universitiesCollegesJurisdictionCurriculumResourcesTable"); - if(data==null){ - return ; + edit: function () { // 获取选中数目 + var data = Common.getOneFromTable(table, "universitiesCollegesJurisdictionCurriculumResourcesTable"); + if (data == null) { + return; } - var url = "/jlw/universitiesCollegesJurisdictionCurriculumResources/edit.do?universitiesCollegesJurisdictionCurriculumResourcesId="+data.universitiesCollegesJurisdictionCurriculumResourcesId; - Common.openDlg(url,"UniversitiesCollegesJurisdictionCurriculumResources管理>"+data.universitiesCollegesJurisdictionCurriculumResourcesId+">编辑"); + var url = "/jlw/universitiesCollegesJurisdictionCurriculumResources/edit.do?universitiesCollegesJurisdictionCurriculumResourcesId=" + data.universitiesCollegesJurisdictionCurriculumResourcesId; + Common.openDlg(url, "UniversitiesCollegesJurisdictionCurriculumResources管理>" + data.universitiesCollegesJurisdictionCurriculumResourcesId + ">编辑"); }, - del : function() { - layui.use(['del'], function(){ + del: function () { + layui.use(['del'], function () { var delView = layui.del delView.delBatch(); }); @@ -141,12 +137,12 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { Lib.doSearchForm($("#searchForm"), universitiesCollegesJurisdictionCurriculumResourcesTable, 1); }, }; - $('.ext-toolbar').on('click', function() { + $('.ext-toolbar').on('click', function () { var type = $(this).data('type'); toolbar[type] ? toolbar[type].call(this) : ''; }); } } - exports('index',view); + exports('index', view); }); \ No newline at end of file