新增课程中心预览时需要用到的接口

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

@@ -78,4 +78,6 @@ public interface ResourcesQuestionSnapshotDao extends BaseMapper<ResourcesQuesti
      */
     @Update
     int updateQuestionStatusByTeacherOpenCourseMergeResourcesQuestionIds(String ids, GlobalUpStatusEnum questionStatus);
+
+    PageQuery<TeacherOpenCourseQuestionTestSimpleInfoVO> getQuestionTestInfoSupplyCenter(PageQuery pageQuery);
 }

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

@@ -505,10 +505,7 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
                             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<ResourcesQuestion>
                                 //}
                             }
 
+                            if (Objects.equals(courseInfo.getCourseInfoStatus(),2)){
+                                errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行课程处于禁止状态，禁止导入"});
+                                continue;
+                            }
+
                             //查章节
                             CourseInfo chapterCourseInfo = null;
                             Map<String, List<CourseInfo>> chapterMap = chapterCache.get(courseInfoName);

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

@@ -450,9 +450,9 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
 
     public PageQuery<TeacherOpenCourseQuestionTestSimpleInfoVO> getQuestionTestInfoSupplyCenter(@NotNull TeacherOpenCourseQuestionTestSimpleInfoDTO query) {
         PageQuery pageQuery = query.getPageQuery();
-        //PageQuery<TeacherOpenCourseQuestionTestSimpleInfoVO> questionTestSimpleInfo = resourcesQuestionSnapshotDao.getQuestionTestInfoSupplyCenter(pageQuery);
-        //dictParser(questionTestSimpleInfo.getList());
-        return null;
+        PageQuery<TeacherOpenCourseQuestionTestSimpleInfoVO> questionTestSimpleInfo = resourcesQuestionSnapshotDao.getQuestionTestInfoSupplyCenter(pageQuery);
+        dictParser(questionTestSimpleInfo.getList());
+        return questionTestSimpleInfo;
     }
 
 

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

@@ -1064,4 +1064,29 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
     public List<TeacherOpenCourseQuestionSetting> queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition) {
         return teacherOpenCourseQuestionSettingDao.queryByConditionQueryNotPage(condition);
     }
+
+
+    /**
+     * 学生端-课程中心-根据题目配置信息，获取相关的题目,不存快照，并返回答案
+     * 错题练习和收藏夹练习不可用
+     *
+     * @param teacherOpenCourseQuestionSettingId 开课作业ID
+     * @return
+     */
+    public List<ResourcesQuestionSnapshot> 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<ResourcesQuestionSnapshot> resourcesQuestionSnapshotList = resourcesQuestionSnapshotDao.getValuesByQueryNotWithPermission(questionSnapshotQuery);
+        resourcesQuestionSnapshotList = ObjectUtil.defaultIfNull(resourcesQuestionSnapshotList, new ArrayList<>());
+        return resourcesQuestionSnapshotList;
+    }
+
 }

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));
+    }
+
     /**
      * 功能描述: <br>
      * 错题练习，错题库根据试卷来

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

@@ -816,3 +816,36 @@ questionTestResults
       t.student_name,
       th.class_name
    ) 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
+        @}