试卷详情接口修改

school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBank.java

@@ -69,7 +69,7 @@ public class DbQuestionBank extends BaseEntity {
     /**
      * 视频名称
      */
-    private String resolveVideName;
+    private String resolveVideoName;
     /**
      * 备注
      */

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

@@ -2,8 +2,10 @@ package com.ruoyi.school.paper.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
 import lombok.Data;
 
+import java.util.List;
 
 
 /**
@@ -108,5 +110,6 @@ public class DbQuestionBankTestPaperVo {
     @ExcelProperty(value = "状态：0正常，1删除")
     private Integer status;
 
+    private List<DbQuestionBankAnswerTestPaper> options;
 
 }

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

@@ -101,4 +101,6 @@ public class MyErrorTopicListVo implements Serializable {
      * 优秀答案数量
      */
     private Long goodsAnswerCount;
+
+    private Integer good;
 }

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

@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
 import com.ruoyi.school.paper.domain.DbQuestionBankTestPaper;
 import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.TestPaperAnswerBo;
 import com.ruoyi.school.paper.domain.vo.DbQuestionBankTestPaperVo;
 import com.ruoyi.school.paper.domain.vo.TestQuestionItemVo;
+import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerTestPaperMapper;
 import com.ruoyi.school.paper.mapper.DbQuestionBankTestPaperMapper;
 import com.ruoyi.school.paper.service.IDbQuestionBankTestPaperService;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +34,7 @@ import java.util.Map;
 public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPaperService {
 
     private final DbQuestionBankTestPaperMapper baseMapper;
+    private final DbQuestionBankAnswerTestPaperMapper answerTestPaperMapper;
 
     /**
      * 查询试卷题库主
@@ -48,6 +51,15 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
     public TableDataInfo<DbQuestionBankTestPaperVo> queryPageList(DbQuestionBankTestPaperBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<DbQuestionBankTestPaper> lqw = buildQueryWrapper(bo);
         Page<DbQuestionBankTestPaperVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(vo -> {
+            if (vo.getSpecies().equals(2)) {
+                List<DbQuestionBankAnswerTestPaper> answerTestPapers = answerTestPaperMapper.selectList(Wrappers.<DbQuestionBankAnswerTestPaper>lambdaQuery()
+                    .eq(DbQuestionBankAnswerTestPaper::getQuestionBankId, vo.getId())
+                    .eq(DbQuestionBankAnswerTestPaper::getStatus, 0)
+                );
+                vo.setOptions(answerTestPapers);
+            }
+        });
         return TableDataInfo.build(result);
     }
 

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

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="topicScore" column="topicScore"/>
         <result property="correctAnswer" column="correctAnswer"/>
         <result property="correctAnswerPic" column="correctAnswerPic"/>
+        <result property="good" column="good"/>
         <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"/>
@@ -49,12 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dtprd.answers_pic,
             dtprd.score,
             dqbatp.species,
-            dqbatp.score as topicScore
+            dqbatp.score as topicScore,
+            dtprd.good
         FROM
             db_test_paper_record_detail dtprd
             LEFT JOIN db_question_bank_test_paper dqbatp ON dtprd.question_bank_id = dqbatp.id
         WHERE
             dtprd.record_id = #{bo.recordId}
+            and dqbatp.species in (1,3)
     </select>
 
     <select id="getOptionList" resultType="com.ruoyi.school.paper.domain.vo.DbQuestionBankAnswerTestPaperVo">