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 | 46 +++++++---------------------------------------
1 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 2e279f0..b7c419a 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.exam.ExamPaperTempDTO">
+ <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,27 +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"/>
- <association property="examTemplate" javaType="com.ycl.jxkg.domain.entity.ExamTemplate">
- <result column="single_choice" property="singleChoice" />
- <result column="single_score" property="singleScore" />
- <result column="multiple_choice" property="multipleChoice" />
- <result column="multiple_score" property="multipleScore" />
- <result column="gap_filling" property="gapFilling" />
- <result column="gap_score" property="gapScore" />
- <result column="true_false" property="trueFalse" />
- <result column="true_false_score" property="trueFalseScore" />
- <result column="short_answer" property="shortAnswer" />
- <result column="short_answer_score" property="shortAnswerScore" />
- <result column="calculation" property="calculation" />
- <result column="calculation_score" property="calculationScore" />
- </association>
</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>
@@ -43,32 +29,17 @@
</resultMap>
- <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
+ <select id="page" resultMap="BaseResultMap">
SELECT
- tep.*,
- tet.single_choice,
- tet.multiple_choice,
- tet.gap_filling,
- tet.true_false,
- tet.short_answer,
- tet.calculation,
- tet.single_score,
- tet.multiple_score,
- tet.gap_score,
- tet.true_false_score,
- tet.short_answer_score,
- tet.calculation_score
- FROM t_exam_paper tep left join t_exam_template tet on tep.id =tet.exam_paper_id
+ tep.*
+ FROM t_exam_paper tep
<where>
- and tep.deleted=0
+ and tep.deleted=0 and (create_user = #{createUser} or visibility = 'Public')
<if test="id != null ">
and tep.id= #{id}
</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}
@@ -93,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