From cfe67e8d67bd66c4e95c553cb56aad71dde8dfa2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 19:05:43 +0800
Subject: [PATCH] 开始考试按钮禁用

---
 src/main/resources/mapper/QuestionMapper.xml |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index dfb80da..69b64af 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -56,6 +56,9 @@
             <if test="content != null and content != ''">
                 and instr(tq.content, #{content})
             </if>
+            <if test="title != null and title != ''">
+                and title like CONCAT('%', #{title}, '%')
+            </if>
         </where>
     </select>
 
@@ -128,33 +131,13 @@
         <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
     </resultMap>
 
-    <resultMap id="exportMap" type="com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO">
-        <result column="question_type" property="questionType"/>
-        <result column="title" property="title"/>
-        <result column="analyze" property="analyze"/>
-        <result column="score" property="score"/>
-        <result column="difficult" property="difficult"/>
-        <result column="content" property="questionContent"/>
-        <result column="score" property="score"/>
-        <result column="correct" property="correct"/>
-        <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
-    </resultMap>
-
-    <select id="export" resultMap="exportMap">
+    <select id="export" resultType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperImportVO">
         SELECT
-        DISTINCT
-        q.*, ttc.content
-        FROM
-        t_question q
-        INNER JOIN t_ex ttc on q.info_text_content_id = ttc.id AND q.deleted = 0
-        <where>
-            <if test="query.examPaperId != null">
-                AND tqs.subject_id IN
-                <foreach collection="query.subjectIds" open="(" separator="," close=")" item="subjectId">
-                    #{subjectId}
-                </foreach>
-            </if>
-        </where>
+            q.*,
+            s.NAME AS SUBJECT
+        FROM t_question q
+        LEFT JOIN t_subject s ON subject_id = s.id
+        ORDER BY q.id
     </select>
 
 </mapper>

--
Gitblit v1.8.0