From 1f16aa96a1f88be11f33efcb2862218be4342e44 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 16 六月 2023 09:16:13 +0800
Subject: [PATCH] 搜索修改
---
src/main/resources/mapper/ExamPaperMapper.xml | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 4854fe2..c3ae32c 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -228,23 +228,26 @@
<select id="page" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper
+ e.*
+ FROM t_exam_paper e
+ left join t_exam_paper_department d on e.id = d.exam_paper_id
+ left join t_exam_paper_subject s on e.id = s.exam_paper_id
<where>
- and deleted=0
+ and e.deleted=0 and d.deleted = 0
<if test="id != null ">
- and id= #{id}
+ and e.id= #{id}
</if>
<if test="level != null ">
- and grade_level= #{level}
+ and d.department_id= #{level}
</if>
<if test="subjectId != null ">
- and subject_id= #{subjectId}
+ and s.subject_id= #{subjectId}
</if>
<if test="paperType != null ">
- and paper_type= #{paperType}
+ and e.paper_type= #{paperType}
</if>
</where>
+ group by e.id
</select>
@@ -281,19 +284,20 @@
<select id="indexPaper" resultMap="PaperInfoResultMap" parameterType="com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter">
- SELECT id,name,limit_start_time,limit_end_time
- FROM t_exam_paper
+ SELECT e.id,e.name,e.limit_start_time,e.limit_end_time
+ FROM t_exam_paper e
+ LEFT JOIN t_exam_paper_department d on d.exam_paper_id = e.id
<where>
- and deleted=0
- and paper_type= #{examPaperType}
- and grade_level=#{gradeLevel}
+ and e.deleted=0 and d.deleted = 0
+ and e.paper_type= #{examPaperType}
+ and d.department_id=#{gradeLevel}
<if test="examPaperType == 3 ">
</if>
<if test="examPaperType == 4 ">
- and #{dateTime} between limit_start_time and limit_end_time
+ and #{dateTime} between e.limit_start_time and e.limit_end_time
</if>
</where>
- ORDER BY id desc limit 5
+ ORDER BY e.id desc limit 5
</select>
@@ -328,4 +332,13 @@
</foreach>
</update>
+ <delete id="removeByIds" parameterType="java.lang.Integer">
+ delete from t_exam_paper
+ where id in
+ <foreach item="id" collection="ids" open="(" separator=","
+ close=")">
+ #{id}
+ </foreach>
+ </delete>
+
</mapper>
--
Gitblit v1.8.0