From fbdd6af3039a83cd4727a03cecb7c5914277371f Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 28 七月 2023 14:44:08 +0800
Subject: [PATCH] 个人练习模板功能
---
src/main/resources/mapper/ExamPaperMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 2ab6a9c..44d642e 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -17,11 +17,12 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="task_exam_id" jdbcType="INTEGER" property="taskExamId" />
+ <result column="type" jdbcType="VARCHAR" property="type" />
</resultMap>
<sql id="Base_Column_List">
id, name, subject_id, paper_type, grade_level, score, question_count, suggest_time,
limit_start_time, limit_end_time, frame_text_content_id, create_user, create_time,
- deleted, task_exam_id
+ deleted, task_exam_id, type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@@ -38,13 +39,14 @@
paper_type, grade_level, score,
question_count, suggest_time, limit_start_time,
limit_end_time, frame_text_content_id, create_user,
- create_time, deleted, task_exam_id
+ create_time, deleted, task_exam_id, type
)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{subjectId,jdbcType=INTEGER},
#{paperType,jdbcType=INTEGER}, #{gradeLevel,jdbcType=INTEGER}, #{score,jdbcType=INTEGER},
#{questionCount,jdbcType=INTEGER}, #{suggestTime,jdbcType=INTEGER}, #{limitStartTime,jdbcType=TIMESTAMP},
#{limitEndTime,jdbcType=TIMESTAMP}, #{frameTextContentId,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER},
- #{createTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{taskExamId,jdbcType=INTEGER}
+ #{createTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{taskExamId,jdbcType=INTEGER},
+ #{type,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.mindskip.xzs.domain.ExamPaper" useGeneratedKeys="true" keyProperty="id">
@@ -95,6 +97,9 @@
<if test="taskExamId != null">
task_exam_id,
</if>
+ <if test="type != null">
+ type,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -141,6 +146,9 @@
</if>
<if test="taskExamId != null">
#{taskExamId,jdbcType=INTEGER},
+ </if>
+ <if test="type != null">
+ #{type,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -246,6 +254,9 @@
<if test="paperType != null ">
and e.paper_type= #{paperType}
</if>
+ <if test="type != null ">
+ and e.type= #{type}
+ </if>
</where>
group by e.id
</select>
@@ -288,6 +299,9 @@
<if test="paperType == 4">
and e.paper_type = #{paperType}
</if>
+ <if test="type != null and type != ''">
+ and e.type = #{type}
+ </if>
</where>
group by e.id
@@ -300,7 +314,7 @@
FROM t_exam_paper e
LEFT JOIN t_exam_paper_department d on d.exam_paper_id = e.id
<where>
- and e.deleted=0 and d.deleted = 0
+ and e.deleted=0 and d.deleted = 0 and e.type = 0
and e.paper_type in
<foreach item="examPaperType" collection="examPaperType" open="(" separator=","
close=")">
@@ -322,7 +336,7 @@
FROM t_exam_paper e
LEFT JOIN t_exam_paper_user u on u.exam_paper_id = e.id
where
- e.deleted=0 and u.deleted = 0
+ e.deleted=0 and u.deleted = 0 and e.type = 0
and u.user_id = #{userId} ORDER BY e.id desc ) t
</select>
--
Gitblit v1.8.0