From d910a3e7ad5bc3a5e5443f506d05bbb9e83a4c8e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 17:14:33 +0800
Subject: [PATCH] 生成试卷时如果题目列表为空，则不反悔这个题型的数据
---
src/main/resources/mapper/ExamPaperMapper.xml | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 52d8067..b7c419a 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"/>
@@ -12,13 +11,14 @@
<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">
- 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>
@@ -29,23 +29,20 @@
</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 and (create_user = #{createUser} or visibility = 'Public')
<if test="id != null ">
- and id= #{id}
+ and tep.id= #{id}
</if>
<if test="name != null and name != ''">
- and name like concat('%',#{name},'%')
- </if>
- <if test="subjectId != null ">
- and subject_id= #{subjectId}
+ and tep.name like concat('%',#{name},'%')
</if>
<if test="paperType != null ">
- and paper_type= #{paperType}
+ and tep.paper_type= #{paperType}
</if>
</where>
</select>
@@ -67,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