From 29b4b0592230e81d2c6933279848d4333787c60d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 11:27:18 +0800
Subject: [PATCH] 排序问题修复
---
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index 614c318..afb4988 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -5,9 +5,11 @@
<resultMap id="PagerSubject" type="org.springblade.modules.exam.vo.ExamPaperSubjectVO"
autoMapping="true">
<id property="id" column="id"/>
- <collection property="examExaminationSubjects" javaType="java.util.List" ofType="org.springblade.modules.exam.entity.ExamExaminationSubject" autoMapping="true">
+ <collection property="examExaminationSubjects" javaType="java.util.List"
+ ofType="org.springblade.modules.exam.entity.ExamExaminationSubject" autoMapping="true">
<id property="id" column="tid"/>
- <association property="examSubjectChoices" javaType="org.springblade.modules.exam.entity.ExamSubjectChoices" resultMap="brakesResult" autoMapping="true">
+ <association property="examSubjectChoices" javaType="org.springblade.modules.exam.entity.ExamSubjectChoices"
+ resultMap="brakesResult" autoMapping="true">
</association>
</collection>
</resultMap>
@@ -15,9 +17,11 @@
<resultMap id="PagerSubjectAnswer" type="org.springblade.modules.exam.vo.ExamPaperSubjectVO"
autoMapping="true">
<id property="id" column="id"/>
- <collection property="examExaminationSubjects" javaType="java.util.List" ofType="org.springblade.modules.exam.entity.ExamExaminationSubject" autoMapping="true">
+ <collection property="examExaminationSubjects" javaType="java.util.List"
+ ofType="org.springblade.modules.exam.entity.ExamExaminationSubject" autoMapping="true">
<id property="id" column="tid"/>
- <association property="examSubjectChoices" javaType="org.springblade.modules.exam.entity.ExamSubjectChoices" autoMapping="true">
+ <association property="examSubjectChoices" javaType="org.springblade.modules.exam.entity.ExamSubjectChoices"
+ autoMapping="true">
<id property="id" column="sid"/>
</association>
</collection>
@@ -29,6 +33,24 @@
<id property="subjectName" column="subject_name"/>
<id property="choicesType" column="choices_type"/>
<id property="score" column="score"/>
+ <id property="analysis" column="analysis"/>
+ <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"/>
+ </resultMap>
+
+ <resultMap id="RandomResult" type="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
+ <id property="id" column="id"/>
+ <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="answer" column=""/>
<id property="analysis" column="analysis"/>
<id property="level" column="level"/>
<id property="creator" column="creator"/>
@@ -52,8 +74,15 @@
WHERE
1 = 1
<if test="paper.id !=null">
- and sj.id = #{paper.id}
+ and sj.id = #{paper.id}
</if>
+ </select>
+
+ <select id="queryRandomSubject" resultMap="RandomResult" >
+ SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 0 ORDER BY RAND( ) LIMIT 50 ) a UNION ALL
+ SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 1 ORDER BY RAND( ) LIMIT 20 ) b UNION ALL
+ SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 2 ORDER BY RAND( ) LIMIT 20 ) c UNION ALL
+ SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 3 ORDER BY RAND( ) LIMIT 5 ) d
</select>
<select id="selectExamPaperPage" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
@@ -81,7 +110,7 @@
WHERE
1 = 1
<if test="paper.id !=null">
- and sj.id = #{paper.id}
+ and sj.id = #{paper.id}
</if>
</select>
--
Gitblit v1.9.3