From 2a045a24a9950dff55373eae2274b92e3db3a54c Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 5 Jul 2024 15:01:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/mapper/ElPaperQuAnswerMapper.java  |  4 ++++
 .../mapper/system/ElPaperQuAnswerMapper.xml         | 13 +++++++++++++
 .../resources/mapper/system/ElPaperQuMapper.xml     | 12 +++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElPaperQuAnswerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElPaperQuAnswerMapper.java
index cd32a53..730e4f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElPaperQuAnswerMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElPaperQuAnswerMapper.java
@@ -26,6 +26,10 @@ public interface ElPaperQuAnswerMapper extends BaseMapper<ElPaperQuAnswer> {
      */
     List<PaperQuAnswerExtDTO> list(@Param("paperId") String paperId, @Param("quId") String quId);
 
+
+
+
+
 }
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/ElPaperQuAnswerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ElPaperQuAnswerMapper.xml
index 150c378..784f172 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ElPaperQuAnswerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ElPaperQuAnswerMapper.xml
@@ -36,4 +36,17 @@
         ORDER BY pa.sort ASC
     </select>
 
+
+    <select id="listForShow" resultMap="ListResultMap">
+        SELECT pa.id,pa.paper_id,pa.answer_id,pa.qu_id,pa.checked,pa.sort,pa.abc,qa.content,qa.is_right,qa.image
+        FROM el_paper_qu_answer pa
+                 LEFT JOIN el_qu_answer qa ON pa.answer_id=qa.id
+        WHERE pa.paper_id=#{paperId} AND pa.qu_id=#{quId}
+        ORDER BY pa.sort ASC
+    </select>
+
+
+
+
+
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/ElPaperQuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ElPaperQuMapper.xml
index 76cb9fe..86d6978 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ElPaperQuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ElPaperQuMapper.xml
@@ -33,7 +33,17 @@
           AND is_right=true
           AND qu_type &lt; 4
     </select>
-    <select id="listForPaperResult" resultType="com.ruoyi.system.domain.paper.dto.ext.PaperQuDetailDTO">
+
+
+    <resultMap id="ListResultMap" extends="BaseResultMap" type="com.ruoyi.system.domain.paper.dto.ext.PaperQuDetailDTO">
+        <result column="image" property="image" />
+        <result column="content" property="content" />
+        <collection property="answerList" column="{paperId=paper_id,quId=qu_id}"
+                    select="com.ruoyi.system.mapper.ElPaperQuAnswerMapper.listForShow" />
+    </resultMap>
+
+
+    <select id="listForPaperResult" resultMap="ListResultMap">
         SELECT pq.*,eq.content,eq.image
         FROM el_paper_qu pq
                  LEFT JOIN el_qu eq ON pq.qu_id = eq.id