答题记录详情列表修改

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordDetailController.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordDetailBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordDetailVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import com.ruoyi.school.paper.service.IDbTestPaperRecordDetailService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -43,7 +44,7 @@ public class DbTestPaperRecordDetailController extends BaseController {
      * 【小程序】查询答题记录详情列表
      */
     @GetMapping("/list")
-    public TableDataInfo<DbTestPaperRecordDetailVo> list(DbTestPaperRecordDetailBo bo, PageQuery pageQuery) {
+    public TableDataInfo<MyErrorTopicListVo> list(DbTestPaperRecordDetailBo bo, PageQuery pageQuery) {
         return iDbTestPaperRecordDetailService.queryPageList(bo, pageQuery);
     }
 

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyErrorTopicListVo.java

@@ -5,6 +5,7 @@ import com.sun.org.apache.xpath.internal.objects.XString;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -28,11 +29,26 @@ public class MyErrorTopicListVo implements Serializable {
     private String answer;
 
     /**
+     * 我的答案图片
+     */
+    private String answerPic;
+
+    /**
      * 正确答案
      */
     private String correctAnswer;
 
     /**
+     * 正确答案图片
+     */
+    private String correctAnswerPic;
+
+    /**
+     * 我的得分
+     */
+    private BigDecimal score;
+
+    /**
      * 题目编号
      */
     private Long questionBankId;
@@ -50,5 +66,10 @@ public class MyErrorTopicListVo implements Serializable {
     /**
      * 选项标签集合
      */
-    private List<DbQuestionBankAnswerTestPaper> options;
+    private List<DbQuestionBankAnswerTestPaperVo> options;
+
+    /**
+     * 优秀答案
+     */
+    private List<GoodsAnswersVo> goodsAnswers;
 }

school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbTestPaperRecordDetailMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.school.paper.domain.DbTestPaperRecordDetail;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordDetailBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordDetailVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +18,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface DbTestPaperRecordDetailMapper extends BaseMapperPlus<DbTestPaperRecordDetailMapper, DbTestPaperRecordDetail, DbTestPaperRecordDetailVo> {
 
-    Page<DbTestPaperRecordDetailVo> queryPageList(Page<Object> build, @Param("bo") DbTestPaperRecordDetailBo bo);
+    Page<MyErrorTopicListVo> queryPageList(Page<Object> build, @Param("bo") DbTestPaperRecordDetailBo bo);
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/IDbTestPaperRecordDetailService.java

@@ -5,6 +5,7 @@ import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordDetailVo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordDetailBo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,7 +26,7 @@ public interface IDbTestPaperRecordDetailService {
     /**
      * 查询答题记录详情列表
      */
-    TableDataInfo<DbTestPaperRecordDetailVo> queryPageList(DbTestPaperRecordDetailBo bo, PageQuery pageQuery);
+    TableDataInfo<MyErrorTopicListVo> queryPageList(DbTestPaperRecordDetailBo bo, PageQuery pageQuery);
 
     /**
      * 查询答题记录详情列表

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperRecordDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.school.paper.domain.DbTestPaperRecordDetail;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordDetailBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordDetailVo;
+import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import com.ruoyi.school.paper.mapper.DbTestPaperRecordDetailMapper;
 import com.ruoyi.school.paper.service.IDbTestPaperRecordDetailService;
 import lombok.RequiredArgsConstructor;
@@ -43,8 +44,8 @@ public class DbTestPaperRecordDetailServiceImpl implements IDbTestPaperRecordDet
      * 查询答题记录详情列表
      */
     @Override
-    public TableDataInfo<DbTestPaperRecordDetailVo> queryPageList(DbTestPaperRecordDetailBo bo, PageQuery pageQuery) {
-        Page<DbTestPaperRecordDetailVo> result = baseMapper.queryPageList(pageQuery.build(), bo);
+    public TableDataInfo<MyErrorTopicListVo> queryPageList(DbTestPaperRecordDetailBo bo, PageQuery pageQuery) {
+        Page<MyErrorTopicListVo> result = baseMapper.queryPageList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
 

school-paper/src/main/resources/mapper/school-paper/DbTestPaperRecordDetailMapper.xml

@@ -19,14 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
     </resultMap>
 
-    <resultMap type="com.ruoyi.school.paper.domain.vo.DbTestPaperRecordDetailVo" id="TestPaperRecordDetailResult">
+    <resultMap type="com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo" id="TestPaperRecordDetailResult">
         <result property="topic" column="topic"/>
         <result property="questionBankId" column="question_bank_id"/>
         <result property="answer" column="answer"/>
         <result property="answerPic" column="answers_pic"/>
         <result property="score" column="score"/>
         <result property="correctAnswer" column="correctAnswer"/>
-        <result property="righAnswersPic" column="right_answers_pic"/>
+        <result property="correctAnswerPic" column="correctAnswerPic"/>
         <collection property="options" javaType="java.util.List"  column="question_bank_id" select="getOptionList" ofType="com.ruoyi.school.paper.domain.vo.DbQuestionBankAnswerTestPaperVo">
             <result property="optionTag" column="option_tag"/>
             <result property="optionContent" column="option_content"/>
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dqbatp.topic,
             dtprd.question_bank_id,
             dqbatp.right_answers AS correctAnswer,
-            dqbatp.right_answers_pic,
+            dqbatp.right_answers_pic as correctAnswerPic,
             dtprd.answer,
             dtprd.answers_pic,
             dtprd.score