From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ExamPaperMapper.xml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 48e1927..b51b22c 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaper">
<id column="id" property="id"/>
<result column="name" property="name"/>
- <result column="subject_id" property="subjectId"/>
<result column="paper_type" property="paperType"/>
<result column="score" property="score"/>
<result column="question_count" property="questionCount"/>
@@ -16,11 +15,10 @@
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="deleted" property="deleted"/>
-
</resultMap>
<sql id="Base_Column_List">
- id, name, subject_id, paper_type, score, question_count, suggest_time,visibility
+ id, name, paper_type, score, question_count, suggest_time,visibility
,deduct_type,deduct_type_score,create_user, create_time,deleted
</sql>
@@ -33,7 +31,7 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- tep.*,
+ tep.*
FROM t_exam_paper tep
<where>
and tep.deleted=0
@@ -42,9 +40,6 @@
</if>
<if test="name != null and name != ''">
and tep.name like concat('%',#{name},'%')
- </if>
- <if test="subjectId != null ">
- and tep.subject_id= #{subjectId}
</if>
<if test="paperType != null ">
and tep.paper_type= #{paperType}
@@ -69,9 +64,6 @@
FROM t_exam_paper
<where>
and deleted=0
- <if test="subjectId != null ">
- and subject_id=#{subjectId}
- </if>
<if test="levelId != null ">
and grade_level=#{levelId}
</if>
--
Gitblit v1.8.0