From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口

---
 src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
index d2842fe..b862992 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
@@ -13,9 +13,10 @@
         <if test="examSubjectChoices.subjectName!=null and  examSubjectChoices.subjectName!=''">
             and esc.subject_name like concat('%', #{examSubjectChoices.subjectName},'%')
         </if>
-        <if test="examSubjectChoices.choicesType!=null and  examSubjectChoices.choicesType!=''">
+        <if test="examSubjectChoices.choicesType!=null">
             and choices_type = #{examSubjectChoices.choicesType}
         </if>
+        order by id desc
     </select>
 
     <!--查询试卷绑定的题目-->
@@ -33,8 +34,8 @@
         <if test="examSubjectChoices.subjectName!=null and  examSubjectChoices.subjectName!=''">
             and esc.subject_name like concat('%', #{examSubjectChoices.subjectName},'%')
         </if>
-        <if test="examSubjectChoices.choicesType!=null and  examSubjectChoices.choicesType!=''">
-            and esc.choices_type = #{examSubjectChoices.choices_type}
+        <if test="examSubjectChoices.choicesType!=null">
+            and esc.choices_type = #{examSubjectChoices.choicesType}
         </if>
     </select>
 
@@ -45,18 +46,9 @@
         <id property="categoryId" column="category_id"/>
         <id property="subjectName" column="subject_name"/>
         <id property="choicesType" column="choices_type"/>
-        <id property="score" column="score"/>
-        <id property="analysis" column="analysis"/>
         <id property="answer" column="answer"/>
+        <id property="score" column="score"/>
         <id property="level" column="level"/>
-        <id property="creator" column="creator"/>
-        <id property="createDate" column="create_date"/>
-        <id property="modifier" column="modifier"/>
-        <id property="modifyDate" column="modify_date"/>
-        <id property="delFlag" column="del_flag"/>
-        <id property="applicationCode" column="application_code"/>
-        <id property="tenantCode" column="tenant_code"/>
-        <id property="tktype" column="tktype"/>
         <result column="id" property="id"/>
         <collection property="examSubjectOptions" javaType="java.util.List" ofType="org.springblade.modules.exam.entity.ExamSubjectOption" autoMapping="true">
             <id property="id" column="eso_id"/>
@@ -64,10 +56,10 @@
     </resultMap>
 
 
-    <!--选择题详情信息-->
+    <!--题目详情信息-->
     <select id="selectExamSubjectChoicesInfo" resultMap="ExamSubjectChoicesInfoMap">
         SELECT
-        esc.*,
+        esc.id,esc.category_id,esc.subject_name,esc.choices_type,esc.score,esc.level,esc.answer,
         eso.id eso_id,eso.subject_choices_id,eso.option_name,eso.option_content,eso.creator,
         eso.create_date,eso.modifier,eso.modify_date,eso.del_flag,eso.application_code,eso.tenant_code
         FROM
@@ -91,4 +83,11 @@
     <delete id="removeBySubjectId">
         delete from exam_subject_option where subject_choices_id = #{id}
     </delete>
+
+    <select id="getExamSubjectChoicesList" resultType="java.lang.String" >
+        SELECT id FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 0 ORDER BY RAND( ) LIMIT 50 ) a UNION ALL
+        SELECT id FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 1 ORDER BY RAND( ) LIMIT 20 ) b UNION ALL
+        SELECT id FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 2 ORDER BY RAND( ) LIMIT 40 ) c UNION ALL
+        SELECT id FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 3 ORDER BY RAND( ) LIMIT 10 ) d
+    </select>
 </mapper>

--
Gitblit v1.9.3