From 6fd2460cc439e64789925e41d7106627d354fcd4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 六月 2024 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 52d8067..48e1927 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -12,9 +12,11 @@
<result column="visibility" property="visibility"/>
<result column="deduct_type" property="deductType"/>
<result column="deduct_type_score" property="deductTypeScore"/>
+ <result column="content" property="content"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="deleted" property="deleted"/>
+
</resultMap>
<sql id="Base_Column_List">
@@ -29,23 +31,23 @@
</resultMap>
- <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
+ <select id="page" resultMap="BaseResultMap">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper
+ tep.*,
+ FROM t_exam_paper tep
<where>
- and deleted=0
+ and tep.deleted=0
<if test="id != null ">
- and id= #{id}
+ and tep.id= #{id}
</if>
<if test="name != null and name != ''">
- and name like concat('%',#{name},'%')
+ and tep.name like concat('%',#{name},'%')
</if>
<if test="subjectId != null ">
- and subject_id= #{subjectId}
+ and tep.subject_id= #{subjectId}
</if>
<if test="paperType != null ">
- and paper_type= #{paperType}
+ and tep.paper_type= #{paperType}
</if>
</where>
</select>
--
Gitblit v1.8.0