From 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 六月 2024 15:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperMapper.xml | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index f954dda..52d8067 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -2,39 +2,34 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperMapper">
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaper">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <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="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"/>
+ <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"/>
+ <result column="suggest_time" property="suggestTime"/>
+ <result column="visibility" property="visibility"/>
+ <result column="deduct_type" property="deductType"/>
+ <result column="deduct_type_score" property="deductTypeScore"/>
+ <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, 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,deduct_type_score,create_user, create_time,deleted
</sql>
- <resultMap id="PaperInfoResultMap" type="com.ycl.jxkg.vo.student.dashboard.PaperInfo">
+ <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>
- <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO">
+ <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper
@@ -43,8 +38,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}
@@ -56,19 +51,17 @@
</select>
<select id="taskExamPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO">
+ parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper
<where>
and deleted=0
- and task_exam_id is null
- and grade_level= #{level}
and paper_type=#{paperType}
</where>
</select>
- <select id="studentPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.student.exam.ExamPaperPageVO">
+ <select id="studentPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper
@@ -85,7 +78,7 @@
</select>
<select id="indexPaper" resultMap="PaperInfoResultMap"
- parameterType="com.ycl.jxkg.vo.student.dashboard.PaperFilter">
+ parameterType="com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter">
SELECT id,name,limit_start_time,limit_end_time
FROM t_exam_paper
<where>
--
Gitblit v1.8.0