From 7457e3aa4f2e0f640a08b35f47de1eabd555d7bf Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 17:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperMapper.xml | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index cc9c2b4..a8e01d7 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -6,31 +6,25 @@
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
<result column="paper_type" jdbcType="INTEGER" property="paperType"/>
- <result column="grade_level" jdbcType="INTEGER" property="gradeLevel"/>
<result column="score" jdbcType="INTEGER" property="score"/>
<result column="question_count" jdbcType="INTEGER" property="questionCount"/>
<result column="suggest_time" jdbcType="INTEGER" property="suggestTime"/>
- <result column="limit_start_time" jdbcType="TIMESTAMP" property="limitStartTime"/>
- <result column="limit_end_time" jdbcType="TIMESTAMP" property="limitEndTime"/>
- <result column="frame_text_content_id" jdbcType="INTEGER" property="frameTextContentId"/>
+ <result column="visibility" jdbcType="INTEGER" property="visibility"/>
+ <result column="deduct_type" jdbcType="INTEGER" property="deductType"/>
<result column="create_user" jdbcType="INTEGER" property="createUser"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
- <result column="task_exam_id" jdbcType="INTEGER" property="taskExamId"/>
</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
+ id, name, subject_id, paper_type, score, question_count, suggest_time,visibility
+ ,deduct_type,create_user, create_time,deleted
</sql>
<resultMap id="PaperInfoResultMap" type="com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
- <result column="limit_start_time" jdbcType="TIMESTAMP" property="limitStartTime"/>
- <result column="limit_end_time" jdbcType="TIMESTAMP" property="limitEndTime"/>
+
</resultMap>
@@ -43,8 +37,8 @@
<if test="id != null ">
and id= #{id}
</if>
- <if test="level != null ">
- and grade_level= #{level}
+ <if test="name != null and name != ''">
+ and name like concat('%',#{name},'%')
</if>
<if test="subjectId != null ">
and subject_id= #{subjectId}
@@ -62,8 +56,6 @@
FROM t_exam_paper
<where>
and deleted=0
- and task_exam_id is null
- and grade_level= #{level}
and paper_type=#{paperType}
</where>
</select>
--
Gitblit v1.8.0