新增典例精讲查询

89f35f76 · zhengyunfei · b6211781 · 89f35f76 · 89f35f76 · 89f35f76
Commit 89f35f76 authored Jul 26, 2023 by zhengyunfei
6 changed files
--- a/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankController.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankController.java
@@ -15,6 +15,7 @@ import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
 import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankAndAnswerVo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import com.ruoyi.school.paper.service.IDbQuestionBankService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -50,6 +51,15 @@ public class DbQuestionBankController extends BaseController {
    }
    /**
+     * 【小程序】查询典例精讲列表
+     */
+    @GetMapping("/exampleList")
+    public TableDataInfo<MyErrorTopicListVo> exampleList(DbQuestionBankBo bo, PageQuery pageQuery) {
+        return iDbQuestionBankService.exampleList(bo, pageQuery);
+    }
+    /**
     * [PC端]导出题库主列表
     */
    @Log(title = "题库主", businessType = BusinessType.EXPORT)

--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyErrorTopicListVo.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyErrorTopicListVo.java
 package com.ruoyi.school.paper.domain.vo;
 import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
+import com.sun.org.apache.xpath.internal.objects.XString;
 import lombok.Data;
 import java.io.Serializable;
@@ -37,6 +38,16 @@ public class MyErrorTopicListVo implements Serializable {
    private Long questionBankId;
    /**
+     * 解答思路
+     */
+    private String resolveCourse;
+    /**
+     * 解答视频
+     */
+    private String resolveVideo;
+    /**
     * 选项标签集合
     */
    private List<DbQuestionBankAnswerTestPaper> options;

--- a/school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionBankMapper.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionBankMapper.java
 package com.ruoyi.school.paper.mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.school.paper.domain.DbQuestionBank;
+import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankAndAnswerVo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import java.io.Serializable;
+import java.util.List;
 /**
 * 题库主Mapper接口
@@ -24,4 +29,9 @@ public interface DbQuestionBankMapper extends BaseMapperPlus<DbQuestionBankMappe
     * @return 题目详细信息
     */
    DbQuestionBankAndAnswerVo selectDetailById(Serializable id);
+    /**
+     * 典例精讲列表
+     */
+    Page<MyErrorTopicListVo> getExampleList(Page<Object> build, @Param("bo") DbQuestionBankBo bo);
 }
--- a/school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionBankService.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionBankService.java
@@ -6,6 +6,7 @@ import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
 import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankAndAnswerVo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import java.util.Collection;
 import java.util.List;
@@ -71,4 +72,12 @@ public interface IDbQuestionBankService {
     * 初始化题库到缓存
     */
    void init();
+    /**
+     * 典例精讲
+     * @param bo  搜索条件
+     * @param pageQuery  分页参数
+     * @return
+     */
+    TableDataInfo<MyErrorTopicListVo> exampleList(DbQuestionBankBo bo, PageQuery pageQuery);
 }
--- a/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankServiceImpl.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankServiceImpl.java
@@ -17,6 +17,7 @@ import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
 import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankAndAnswerVo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerMapper;
 import com.ruoyi.school.paper.mapper.DbQuestionBankMapper;
 import com.ruoyi.school.paper.service.IDbQuestionBankService;
@@ -213,4 +214,13 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
        List<DbQuestionBank> dbQuestionBanks = baseMapper.selectList(Wrappers.<DbQuestionBank>lambdaQuery().eq(DbQuestionBank::getStatus, 0));
        RedisUtils.setCacheObject("question_bank:default_question_bank", JsonUtils.toJsonString(dbQuestionBanks));
    }
+    /**
+     * 典例精讲
+     */
+    @Override
+    public TableDataInfo<MyErrorTopicListVo> exampleList(DbQuestionBankBo bo, PageQuery pageQuery) {
+        Page<MyErrorTopicListVo> result = baseMapper.getExampleList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
 }
--- a/school-paper/src/main/resources/mapper/school-paper/DbQuestionBankMapper.xml
+++ b/school-paper/src/main/resources/mapper/school-paper/DbQuestionBankMapper.xml
@@ -73,5 +73,40 @@
        where bank.id = #{id}
    </select>
+    <resultMap id="MyErrorTopicListVo" type="com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo">
+        <result property="questionBankId" column="question_bank_id"/>
+        <result property="topic" column="topic"/>
+        <result property="resolveCourse" column="resolve_course"/>
+        <result property="resolveVideo" column="resolve_video"/>
+        <collection property="options" javaType="java.util.List" resultMap="DbQuestionBankAnswerResult"/>
+    </resultMap>
+    <resultMap type="com.ruoyi.school.paper.domain.DbQuestionBankAnswer" id="DbQuestionBankAnswerResult">
+        <result property="id" column="id"/>
+        <result property="questionBankId" column="question_bank_id"/>
+        <result property="optionTag" column="option_tag"/>
+        <result property="optionContent" column="option_content"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+    <select id="getExampleList" resultMap="MyErrorTopicListVo">
+        select qb.id as question_bank_id,
+                qb.topic as topic,
+                qb.resolve_course,
+                qb.resolve_video,
+                dqba.*
+        from db_question_bank qb
+        left join db_question_bank_answer dqba  on qb.id = dqba.question_bank_id
+        where type = 1
+        <if test="bo.categoryId != null">
+            and qb.category_id = #{bo.categoryId}
+        </if>
+        <if test="bo.species != null">
+            and qb.species = #{bo.species}
+        </if>
+    </select>
 </mapper>