From 291f6f66747f0a9cdad8322d820838196d2a4e57 Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Fri, 30 Jun 2023 11:50:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=BE=E7=A8=8B=E3=80=81=E9=99=A2=E6=A0=A1?= =?UTF-8?q?=E5=BC=80=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/jlw/dao/CourseInfoDao.java | 9 +++ .../com/ibeetl/jlw/entity/CourseInfo.java | 10 +++ .../entity/vo/TeacherOpenCourseChatLogVo.java | 2 + .../ibeetl/jlw/service/CourseInfoService.java | 6 ++ .../ibeetl/jlw/web/CourseInfoController.java | 8 ++- .../TeacherOpenCourseChatLogController.java | 5 +- .../TeacherOpenCourseMergeStudentQuery.java | 10 ++- web/src/main/resources/sql/jlw/courseInfo.md | 61 +++++++++++++++++++ .../sql/jlw/teacherOpenCourseMergeStudent.md | 3 + .../indexInfoStu.html | 2 +- 10 files changed, 110 insertions(+), 6 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java index b6d93214..c1ebe2b6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java @@ -71,4 +71,13 @@ public interface CourseInfoDao extends BaseMapper{ * @return */ List getCourseSystemOAndUniversities(Long orgId); + + /** + * 课程配置 + * @param query + * @return + */ + PageQuery getCourseDispositionSystemOAndUniversities(PageQuery query); + + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java index 6c570491..0ec7b48a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java @@ -108,6 +108,8 @@ public class CourseInfo extends BaseEntity{ */ private Integer sourceType; + private String userName; + @UpdateIgnore @InsertIgnore // @FetchSql("select * from resources_info t where t.course_info_id = #courseInfoId# order by order_index asc") @@ -376,4 +378,12 @@ public class CourseInfo extends BaseEntity{ public void setSourceType(Integer sourceType) { this.sourceType = sourceType; } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseChatLogVo.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseChatLogVo.java index dfebeb99..e7431132 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseChatLogVo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseChatLogVo.java @@ -5,10 +5,12 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.FieldNameConstants; import java.util.Date; @Data +@FieldNameConstants @ExcelIgnoreUnannotated @EqualsAndHashCode(callSuper=false) public class TeacherOpenCourseChatLogVo { 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 8eeb29bb..dc7d3ba1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -143,6 +143,12 @@ public class CourseInfoService extends CoreBaseService { return ret; } + public PageQuery getCourseDispositionSystemOAndUniversities(PageQuery query) { + PageQuery ret = courseInfoDao.getCourseDispositionSystemOAndUniversities(query); + queryListAfter(ret.getList()); + return ret; + } + public PageQuery queryByConditionQuery(PageQuery query) { PageQuery ret = courseInfoDao.queryByConditionQuery(query); queryListAfter(ret.getList()); 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 a8d26786..55192b12 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -342,11 +342,15 @@ public class CourseInfoController { @PostMapping(MODEL + "/courseInfoList.json") @Function("courseInfo.query") @ResponseBody - public JsonResult courseInfoList(CourseInfoQuery condition) { + public JsonResult courseInfoList(CourseInfoQuery condition,@SCoreUser CoreUser coreUser) { condition.setCourseInfoType(1);//类型(1课程 2章 3节) PageQuery page = condition.getPageQuery(); page.setOrderBy("add_time desc"); - 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/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java index 0eefc1c4..ff2d7331 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java @@ -89,7 +89,8 @@ public class TeacherOpenCourseChatLogController extends BaseController { * @param coreUser * @return */ - @GetMapping(API + "/exportPageList.do") + @PostMapping(API + "/exportPageList.do") + @ResponseBody public JsonResult exportPageList(TeacherOpenCourseChatLogQuery condition, @SCoreUser CoreUser coreUser) throws IOException { if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); @@ -98,7 +99,7 @@ public class TeacherOpenCourseChatLogController extends BaseController { String filename = StrUtil.format("互动-学生提问详情{}.xlsx", System.currentTimeMillis()); write(response, filename,"Sheet1", TeacherOpenCourseChatLogVo.class, teacherOpenCourseChatLogPageQuery); - return JsonResult.success(); + return null; } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java index 4e4651ea..4fc20724 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java @@ -38,7 +38,7 @@ public class TeacherOpenCourseMergeStudentQuery extends PageParam { private String studentSnOrName; // 班级集合 - + private Long schoolClassId; private String schoolClassIdPlural; private String teacherOpenCourseSchoolClassMergeStudentIdPlural; @@ -181,4 +181,12 @@ private String teacherOpenCourseSchoolClassMergeStudentStatusPlural; public void setSchoolClassIdPlural(String schoolClassIdPlural) { this.schoolClassIdPlural = schoolClassIdPlural; } + + public Long getSchoolClassId() { + return schoolClassId; + } + + public void setSchoolClassId(Long schoolClassId) { + this.schoolClassId = schoolClassId; + } } diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md index 98dfa7dd..06658b4d 100644 --- a/web/src/main/resources/sql/jlw/courseInfo.md +++ b/web/src/main/resources/sql/jlw/courseInfo.md @@ -932,3 +932,64 @@ getCourseSystemOAndUniversities @} ) ) tt + +getCourseDispositionSystemOAndUniversities +=== +* 查询课程配置所有授权的课程和本校自己上传的课程 + +SELECT +@pageTag(){ +tt.* +@} +FROM +( +SELECT +a.course_info_name, +a.course_info_id, +a.course_info_type, +a.course_label_id, +aa.course_label_type, +aa.course_label_name, +ab.`NAME` AS user_name, +a.user_id, +a.course_info_status, +a.add_time, +'2' AS source_type +FROM +course_info a +LEFT JOIN course_label aa ON aa.course_label_id = a.course_label_id +LEFT JOIN core_user ab ON ab.ID = a.user_id +WHERE +a.course_info_status IN(1,2) +AND a.course_info_type = 1 + +UNION ALL + +SELECT +b.teacher_open_course_title AS course_info_name, +b.teacher_open_course_id AS course_info_id, +'1' AS course_info_type, +'0' AS course_label_id , +'院校' AS course_label_type , +'开课类' AS course_label_name , +ba.universities_colleges_name AS user_name, +b.user_id, +b.teacher_open_course_status AS course_info_status, +b.create_time AS add_time, +'1' AS source_type +FROM +teacher_open_course b +LEFT JOIN universities_colleges ba ON ba.org_id = b.org_id +WHERE +b.teacher_open_course_status IN(1,2) +) tt +WHERE 1=1 +@if(!isEmpty(courseInfoName)){ +and tt.course_info_name like #'%'+courseInfoName+'%'# +@} +@if(!isEmpty(sourceType)){ +and tt.source_type = #sourceType# +@} +@if(!isEmpty(courseLabelId)){ +and tt.course_label_id = #courseLabelId# +@} \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md index 0caa2b26..f93e88a2 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md @@ -129,6 +129,9 @@ queryByConditionQuery @if(!isEmpty(schoolClassIdPlural)){ and find_in_set(ta.class_id, #schoolClassIdPlural#) @} + @if(!isEmpty(schoolClassId) && isEmpty(schoolClassIdPlural)){ + and ta.class_id = #schoolClassId# + @} @pageIgnoreTag(){ order by t.teacher_open_course_school_class_merge_student_add_time desc @} diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/indexInfoStu.html b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/indexInfoStu.html index a5207b16..286cf976 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/indexInfoStu.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseChatLog/indexInfoStu.html @@ -198,7 +198,7 @@ layui.use(['form','laydate','table','laytpl'], function(){ var url = '/api/teacherOpenCourseChatLog/exportPageList.do'+param; layer.confirm("确认要导出学生提问详情表?", function (index) { - $.downFile(Common.ctxPath + url,'学生提问详情'); + $.downFile(Common.ctxPath + url,'学生提问详情','post'); layer.close(index); //Common.downLoad("/api/teacherOpenCourseChatLog/exportPageList.do", param, 'GET') });