From f8f0ed20e05d521005ddcef2611ca303ae7e7a0c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:33 +0800
Subject: [PATCH] 练习bug修改

---
 src/main/resources/mapper/QuestionSubjectMapper.xml |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/QuestionSubjectMapper.xml b/src/main/resources/mapper/QuestionSubjectMapper.xml
index 24ef74e..69f5979 100644
--- a/src/main/resources/mapper/QuestionSubjectMapper.xml
+++ b/src/main/resources/mapper/QuestionSubjectMapper.xml
@@ -57,11 +57,65 @@
 
     <select id="countQuestionNum" resultType="integer">
         SELECT
-               count(distinct id)
+               count(distinct tqs.question_id)
+        FROM
+             t_question_subject tqs
+                INNER JOIN t_question tq ON tq.id = tqs.question_id <if test="questionType != -99">AND tq.question_type = #{questionType}</if>
+        WHERE
+            tqs.subject_id IN <foreach collection="subjects" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+
+    </select>
+
+    <select id="getRandomQuestionId" resultType="com.mindskip.xzs.domain.vo.QuestionVO">
+        SELECT
+            distinct
+            tq.id,
+            tq.question_type as questionType,
+            tq.difficult,
+            ttc.content as contentJson,
+            tq.correct
+        FROM
+             t_question_subject tqs
+                 INNER JOIN t_question tq ON tqs.question_id = tq.id AND tq.deleted = 0
+                                                 <if test="questionType != null and questionType != -99">
+                                                     AND tq.question_type = #{questionType}
+                                                 </if>
+                                                 AND tqs.subject_id IN <foreach collection="subjectIds" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+                 INNER JOIN t_text_content ttc ON tq.info_text_content_id = ttc.id
+        ORDER BY
+             RAND() LIMIT #{questionNum}
+    </select>
+
+    <select id="questionsBySubjectIds" resultType="integer">
+        SELECT
+               question_id
         FROM
              t_question_subject
-        WHERE
-              subject_id IN <foreach collection="subjects" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+        <where>
+            subject_id IN <foreach collection="subjectIds" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+        </where>
+        ORDER BY
+            id DESC
+    </select>
+
+    <select id="questionsBySubjectId"  resultType="integer">
+        SELECT
+            tqs.question_id
+        FROM
+            t_question_subject tqs
+                INNER JOIN t_question tq ON tqs.question_id = tq.id AND tqs.subject_id = #{subjectId}
+        ORDER BY
+            tqs.id DESC
+    </select>
+
+    <select id="questionsBySubjectIdAndQuestionType" resultType="integer">
+        SELECT
+            tqs.question_id
+        FROM
+            t_question_subject tqs
+                INNER JOIN t_question tq ON tqs.question_id = tq.id AND tqs.subject_id = #{subjectId} AND tq.question_type = #{questionType}
+        ORDER BY
+            tqs.id DESC
     </select>
 
 </mapper>

--
Gitblit v1.8.0