修复课程清单

beetlsql3-dev
yaodan 2 years ago
parent 10e016430a
commit 4a490bafa6

@ -62,4 +62,6 @@ public interface CourseInfoDao extends BaseMapper<CourseInfo>{
PageQuery<CourseInfo> examCourseQuestionDO(PageQuery<CourseInfoQuery> pageQuery);
PageQuery<CourseInfo> queryChapterExerciseInfoList(PageQuery pageQuery);
PageQuery<CourseInfo> queryAllAuthCourseInfoAndOpenCourse(PageQuery query);
}

@ -74,5 +74,6 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends
List<UniversitiesCollegesJurisdictionCurriculumResources> getAuthorizedCourse(Long orgId, String courseLabelIdPlural);
PageQuery queryAllAuthCourseInfoAndOpenCourse(PageQuery query);
}

@ -3,7 +3,6 @@ package com.ibeetl.jlw.entity;
import cn.hutool.json.JSONUtil;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.entity.BaseEntity;
import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.InsertIgnore;
import org.beetl.sql.annotation.entity.UpdateIgnore;
@ -21,7 +20,6 @@ import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
* gen by Spring Boot2 Admin 2021-06-24
*/
@Fetch
@EqualsAndHashCode(callSuper=false)
public class CourseInfo extends BaseEntity{
//ID

@ -1541,4 +1541,11 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
public PageQuery<CourseInfo> queryChapterExerciseInfoList(PageQuery pageQuery){
return courseInfoDao.queryChapterExerciseInfoList(pageQuery);
}
public PageQuery<CourseInfo> queryAllAuthCourseInfoAndOpenCourse(PageQuery query) {
PageQuery ret = courseInfoDao.queryAllAuthCourseInfoAndOpenCourse(query);
queryListAfter(ret.getList());
return ret;
}
}

@ -51,11 +51,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
queryListAfter(ret.getList());
return ret;
}
public PageQuery<CourseInfo> queryAllAuthCourseInfoAndOpenCourse(PageQuery query) {
PageQuery ret = universitiesCollegesJurisdictionCurriculumResourcesDao.queryAllAuthCourseInfoAndOpenCourse(query);
queryListAfter(ret.getList());
return ret;
}
public void deleteUniversitiesCollegesJurisdictionCurriculumResources(String ids) {

@ -495,5 +495,26 @@ public class CourseInfoController {
return JsonResult.success(list);
}
@PostMapping(MODEL + "/listWithCourseInfo.json")
@Function("universitiesCollegesJurisdictionCurriculumResources.query")
@ResponseBody
public JsonResult<PageQuery> listWithCourseInfo(CourseInfoQuery condition, @SCoreUser CoreUser coreUser){
if (coreUser.isUniAdmin()) {
condition.setOrgId(coreUser.getOrgId());
}
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<CourseInfo> courseInfoPageQuery = courseInfoService.queryAllAuthCourseInfoAndOpenCourse(page);
return JsonResult.success(courseInfoPageQuery);
}
}

@ -161,25 +161,6 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{
//}
@PostMapping(MODEL + "/listWithCourseInfo.json")
@Function("universitiesCollegesJurisdictionCurriculumResources.query")
@ResponseBody
public JsonResult<PageQuery> listWithCourseInfo(UniversitiesCollegesJurisdictionCurriculumResourcesQuery condition, @SCoreUser CoreUser coreUser){
if (coreUser.isUniAdmin()) {
condition.setOrgId(coreUser.getOrgId());
}
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<CourseInfo> courseInfoPageQuery = universitiesCollegesJurisdictionCurriculumResourcesService.queryAllAuthCourseInfoAndOpenCourse(page);
return JsonResult.success(courseInfoPageQuery);
}
@PostMapping(MODEL + "/add.json")
@Function("universitiesCollegesJurisdictionCurriculumResources.add")

@ -79,6 +79,10 @@ public class CourseInfoQuery extends PageParam {
private String courseInfoStatusPlural;
private String useTypePlural;
private Integer sourceType;//来源类型 1.开课 2.授权课
public String getOrgIdPlural() {
return orgIdPlural;
}
@ -342,4 +346,21 @@ public class CourseInfoQuery extends PageParam {
public void setCourseInfoStatusPlural(String courseInfoStatusPlural) {
this.courseInfoStatusPlural = courseInfoStatusPlural;
}
public String getUseTypePlural() {
return useTypePlural;
}
public void setUseTypePlural(String useTypePlural) {
this.useTypePlural = useTypePlural;
}
public Integer getSourceType() {
return sourceType;
}
public void setSourceType(Integer sourceType) {
this.sourceType = sourceType;
}
}

@ -801,4 +801,84 @@ queryChapterExerciseInfoList
and t.course_info_type=2
and t.course_info_status = 1
and (select count(*) from resources_question rq where rq.course_info_id = t.course_info_id) > 0
order by t.order_index asc
order by t.order_index asc
queryAllAuthCourseInfoAndOpenCourse
===
* 查询所有授权的课程和本校自己上传的课程
select
@pageTag(){
tt.type,
tt.use_type,
tt.use_start_time,
tt.use_end_time,
tt.course_info_id,
tt.course_info_name,
tt.course_label_type,
tt.course_label_name,
tt.add_time
@}
from
((
select
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(useTypePlural)){
and find_in_set(t.use_type, #useTypePlural#)
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
)
UNION ALL
(
SELECT
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
where 1=1
@if(!isEmpty(courseInfoName)){
and tt.course_info_name like #'%'+courseInfoName+'%'#
@}
@if(!isEmpty(sourceType)){
and tt.type = #sourceType#
@}

@ -205,111 +205,6 @@ 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

@ -20,7 +20,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
method: 'post',
size: "lg",
// url : Common.ctxPath + '/jlw/universitiesCollegesJurisdictionCurriculumResources/list.json' // 数据接口
url: Common.ctxPath + '/jlw/universitiesCollegesJurisdictionCurriculumResources/listWithCourseInfo.json?useTypePlural=1,2' // 数据接口
url: Common.ctxPath + '/jlw/courseInfo/listWithCourseInfo.json?useTypePlural=1,2' // 数据接口
, page: Lib.tablePage // 开启分页
, limit: 10,
cols: [[ // 表头
@ -59,7 +59,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
field: 'useType',
title: '使用级别',
templet: function (d) {
return d.useType === 0 ? '不使用' : (d.useType === 1 ? '购买' : (d.useType === 2 ? '试用' : (d.useType === 3 ? '-' : '试用')));
var typeMap = {
0: '不使用',
1: '购买',
2: '试用',
3: '-'
}
return typeMap[d.useType];
},
},
{

Loading…
Cancel
Save