From f33f56fb2ebfea915b93467698ca6b243ee934ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:32:49 +0800
Subject: [PATCH] 导出完善

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

diff --git a/src/main/resources/mapper/QuestionSubjectMapper.xml b/src/main/resources/mapper/QuestionSubjectMapper.xml
index c5aa74d..e9912cf 100644
--- a/src/main/resources/mapper/QuestionSubjectMapper.xml
+++ b/src/main/resources/mapper/QuestionSubjectMapper.xml
@@ -104,7 +104,7 @@
         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 tct.id = tq.info_text_content_id
+                INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
         ORDER BY
             tqs.id DESC
     </select>
@@ -115,7 +115,7 @@
         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 ttc.id = tq.info_text_content_id
+                INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
         ORDER BY
             tqs.id DESC
     </select>
@@ -143,9 +143,22 @@
         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 tct.id = tq.info_text_content_id
+                INNER JOIN t_text_content ttc ON ttc.id = tq.info_text_content_id
         ORDER BY
             tq.id DESC
     </select>
 
+    <select id="getSubjectBySubjectIds" resultType="com.mindskip.xzs.domain.QuestionSubject">
+        select qs.*,s.name as subName
+        from t_question_subject qs
+                 left join t_subject s on qs.subject_id = s.id
+        where qs.deleted = 0 and s.deleted = 0
+        <if test="subjectIds != null and subjectIds.length > 0">
+            and qs.subject_id in
+            <foreach collection="subjectIds" item="subjectId" open="(" separator="," close=")">
+                #{subjectId}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.8.0