From 5b50b758f66bb5a2e8303e33c162e3dea00ff83c Mon Sep 17 00:00:00 2001 From: yaodan <1421553879@qq.com> Date: Tue, 23 May 2023 19:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=A2=84=E8=A7=88=E6=97=B6=E9=9C=80=E8=A6=81=E7=94=A8?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/dao/ResourcesQuestionSnapshotDao.java | 2 ++ .../jlw/service/ResourcesQuestionService.java | 10 +++--- .../ResourcesQuestionSnapshotService.java | 6 ++-- ...acherOpenCourseQuestionSettingService.java | 25 +++++++++++++ ...erOpenCourseQuestionSettingController.java | 13 +++++++ .../sql/jlw/resourcesQuestionSnapshot.md | 35 ++++++++++++++++++- 6 files changed, 83 insertions(+), 8 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java index 0135492e..0226926b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java @@ -78,4 +78,6 @@ public interface ResourcesQuestionSnapshotDao extends BaseMapper getQuestionTestInfoSupplyCenter(PageQuery pageQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java index 975b055e..419f5817 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java @@ -505,10 +505,7 @@ public class ResourcesQuestionService extends CoreBaseService CourseInfo courseInfo = null; if (courseInfoCache.containsKey(courseInfoName)) { courseInfo = courseInfoCache.get(courseInfoName); - if (Objects.equals(courseInfo.getCourseInfoStatus(),2)){ - errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行课程处于禁止状态，禁止导入"}); - continue; - } + } else { //查课程 CourseInfoQuery courseInfoQuery = new CourseInfoQuery(); @@ -585,6 +582,11 @@ public class ResourcesQuestionService extends CoreBaseService //} } + if (Objects.equals(courseInfo.getCourseInfoStatus(),2)){ + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行课程处于禁止状态，禁止导入"}); + continue; + } + //查章节 CourseInfo chapterCourseInfo = null; Map> chapterMap = chapterCache.get(courseInfoName); diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java index 496d5e8e..9170c309 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java @@ -450,9 +450,9 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService getQuestionTestInfoSupplyCenter(@NotNull TeacherOpenCourseQuestionTestSimpleInfoDTO query) { PageQuery pageQuery = query.getPageQuery(); - //PageQuery questionTestSimpleInfo = resourcesQuestionSnapshotDao.getQuestionTestInfoSupplyCenter(pageQuery); - //dictParser(questionTestSimpleInfo.getList()); - return null; + PageQuery questionTestSimpleInfo = resourcesQuestionSnapshotDao.getQuestionTestInfoSupplyCenter(pageQuery); + dictParser(questionTestSimpleInfo.getList()); + return questionTestSimpleInfo; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java index 6a08f768..d6563e24 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java @@ -1064,4 +1064,29 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition) { return teacherOpenCourseQuestionSettingDao.queryByConditionQueryNotPage(condition); } + + + /** + * 学生端-课程中心-根据题目配置信息，获取相关的题目,不存快照，并返回答案 + * 错题练习和收藏夹练习不可用 + * + * @param teacherOpenCourseQuestionSettingId 开课作业ID + * @return + */ + public List questionDetailBYCenter(@NotNull(message = "题目配置ID不能为空！") final Long teacherOpenCourseQuestionSettingId, CoreUser coreUser) { + // 获取学生ID + final Student student = getStudent(); + Assert.notNull(student, "非学生身份，无法获取题目!"); + + TeacherOpenCourseQuestionSetting setting = getInfo(teacherOpenCourseQuestionSettingId); + Assert.notNull(setting, "未查询到来源ID对应的题目！"); + + ResourcesQuestionSnapshotQuery questionSnapshotQuery = new ResourcesQuestionSnapshotQuery(); + questionSnapshotQuery.setTeacherOpenCourseQuestionSettingId(teacherOpenCourseQuestionSettingId); + // 题目查询 + List resourcesQuestionSnapshotList = resourcesQuestionSnapshotDao.getValuesByQueryNotWithPermission(questionSnapshotQuery); + resourcesQuestionSnapshotList = ObjectUtil.defaultIfNull(resourcesQuestionSnapshotList, new ArrayList<>()); + return resourcesQuestionSnapshotList; + } + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java index ad329ceb..5f1649f4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java @@ -224,6 +224,19 @@ public class TeacherOpenCourseQuestionSettingController { return JsonResult.success(teacherOpenCourseQuestionSettingService.questionDetail(teacherOpenCourseQuestionSettingId, fromTypeEnum, coreUser)); } + /** + * 学生端-课程中心-根据题目配置信息，获取相关的题目,不存快照，并返回答案 + * 每次获取 + * 申请试卷 + * + * @param teacherOpenCourseQuestionSettingId 配置ID + * @return + */ + @PostMapping(API + "/questionDetailBYCenter.do") + public JsonResult questionDetailBYCenter(Long teacherOpenCourseQuestionSettingId, @SCoreUser CoreUser coreUser) { + return JsonResult.success(teacherOpenCourseQuestionSettingService.questionDetailBYCenter(teacherOpenCourseQuestionSettingId, coreUser)); + } + /** * 功能描述:
* 错题练习，错题库根据试卷来 diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md index d60606fd..a9621471 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md @@ -815,4 +815,37 @@ questionTestResults t.student_sn, t.student_name, th.class_name - ) z \ No newline at end of file + ) z + + +getQuestionTestInfoSupplyCenter +=== + *学生端-获取章节练习的简单信息,供课程中心使用 + + SELECT + @pageTag(){ + t.teacher_open_course_question_setting_id, + t.teacher_open_course_question_setting_name, + t.teacher_open_course_question_setting_type, + t.teacher_open_course_question_start_time, + t.teacher_open_course_question_end_time, + t.teacher_open_course_merge_course_info_id, + (select count(distinct (tb.resources_question_snapshot_id)) + from resources_question_snapshot tb + where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id + and tb.question_status = 1) as question_total_count + @} + FROM teacher_open_course_question_setting t + WHERE 1 = 1 + AND t.teacher_open_course_question_setting_push_status = 1 + AND t.teacher_open_course_question_setting_status = 1 + AND t.teacher_open_course_question_setting_type = #teacherOpenCourseQuestionSettingType# + AND t.teacher_open_course_id = #teacherOpenCourseId# + AND (select count(distinct (tb.resources_question_snapshot_id)) + from resources_question_snapshot tb + where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id + and tb.question_status = 1) > 0 + @pageIgnoreTag() { + ORDER BY + CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc + @}