From 3c3c7cb06d7091d06109ad6076e9dcfd965356d9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 15:40:08 +0800
Subject: [PATCH] 打包问题，正式数据备份
---
src/main/resources/mapper/QuestionSubjectMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/QuestionSubjectMapper.xml b/src/main/resources/mapper/QuestionSubjectMapper.xml
index 7f134aa..f46a7f3 100644
--- a/src/main/resources/mapper/QuestionSubjectMapper.xml
+++ b/src/main/resources/mapper/QuestionSubjectMapper.xml
@@ -57,11 +57,13 @@
<select id="countQuestionNum" resultType="integer">
SELECT
- count(distinct id)
+ count(distinct tqs.question_id)
FROM
- t_question_subject
+ 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
- subject_id IN <foreach collection="subjects" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+ 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">
@@ -74,7 +76,11 @@
tq.correct
FROM
t_question_subject tqs
- INNER JOIN t_question tq ON tqs.question_id = tq.id AND tq.deleted = 0 AND tqs.subject_id IN <foreach collection="subjectIds" open="(" separator="," close=")" item="subjectId">#{subjectId}</foreach>
+ 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}
@@ -92,24 +98,54 @@
id DESC
</select>
- <select id="questionsBySubjectId" resultType="integer">
+ <select id="questionsBySubjectId" resultType="integer">
SELECT
- tqs.question_id
+ tqs.question_id, ttc.content
FROM
t_question_subject tqs
INNER JOIN t_question tq ON tqs.question_id = tq.id AND tqs.subject_id = #{subjectId}
+ INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
ORDER BY
tqs.id DESC
</select>
<select id="questionsBySubjectIdAndQuestionType" resultType="integer">
SELECT
- tqs.question_id
+ tqs.question_id, ttc.content
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}
+ INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
ORDER BY
tqs.id DESC
</select>
+ <select id="bySubjectId" resultType="com.mindskip.xzs.domain.vo.QuestionVO">
+ SELECT
+ tq.id,
+ tq.question_type,
+ tq.correct,
+ ttc.content as contentJson
+ FROM
+ t_question_subject tqs
+ INNER JOIN t_question tq ON tqs.question_id = tq.id AND tqs.subject_id = #{subjectId}
+ INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
+ ORDER BY
+ tq.id DESC
+ </select>
+
+ <select id="bySubjectIdAndQuestionType" resultType="com.mindskip.xzs.domain.vo.QuestionVO">
+ SELECT
+ tq.id,
+ tq.question_type,
+ tq.correct,
+ ttc.content as contentJson
+ 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}
+ INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
+ ORDER BY
+ tq.id DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0