From 9b8264bd45b103476e2f9d662aa8c324a41f3357 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 12 六月 2024 09:10:46 +0800
Subject: [PATCH] 试卷逻辑更改
---
src/main/resources/mapper/ExamPaperMapper.xml | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 52d8067..2e279f0 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/src/main/resources/mapper/ExamPaperMapper.xml
@@ -1,7 +1,7 @@
<?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.entity.ExamPaper">
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.exam.ExamPaperTempDTO">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="subject_id" property="subjectId"/>
@@ -15,6 +15,20 @@
<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">
@@ -31,21 +45,33 @@
<select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper
+ 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
<where>
- and deleted=0
+ and tep.deleted=0
<if test="id != null ">
- and id= #{id}
+ and tep.id= #{id}
</if>
<if test="name != null and name != ''">
- and name like concat('%',#{name},'%')
+ and tep.name like concat('%',#{name},'%')
</if>
<if test="subjectId != null ">
- and subject_id= #{subjectId}
+ and tep.subject_id= #{subjectId}
</if>
<if test="paperType != null ">
- and paper_type= #{paperType}
+ and tep.paper_type= #{paperType}
</if>
</where>
</select>
--
Gitblit v1.8.0