From 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 六月 2024 13:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperMapper.xml | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 2e279f0..165bcf3 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.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"/>
@@ -12,23 +12,10 @@
<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">
@@ -43,22 +30,10 @@
</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
<if test="id != null ">
--
Gitblit v1.8.0