From 7457e3aa4f2e0f640a08b35f47de1eabd555d7bf Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 17:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamTemplateMapper.xml | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/ExamTemplateMapper.xml b/src/main/resources/mapper/ExamTemplateMapper.xml
index 9edd4df..2243cd1 100644
--- a/src/main/resources/mapper/ExamTemplateMapper.xml
+++ b/src/main/resources/mapper/ExamTemplateMapper.xml
@@ -4,25 +4,19 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO">
- <result column="name" property="name" />
- <result column="subject_id" property="subjectId" />
- <result column="suggest_time" property="suggestTime" />
+ <result column="exam_paper_id" property="examPaperId" />
<result column="single_choice" property="singleChoice" />
<result column="multiple_choice" property="multipleChoice" />
<result column="gap_filling" property="gapFilling" />
<result column="true_false" property="trueFalse" />
<result column="short_answer" property="shortAnswer" />
<result column="calculation" property="calculation" />
- <result column="score" property="score" />
- <result column="deduct_type" property="deductType" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
<result column="single_score" property="singleScore" />
<result column="multiple_score" property="multipleScore" />
<result column="gap_score" property="gapScore" />
<result column="true_false_score" property="trueFalseScore" />
<result column="short_answer_score" property="shortAnswerScore" />
- <result column="calculation__score" property="calculationScore" />
+ <result column="calculation_score" property="calculationScore" />
</resultMap>
@@ -33,19 +27,13 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
- TET.name,
- TET.subject_id,
- TET.suggest_time,
+ TET.exam_paper_id,
TET.single_choice,
TET.multiple_choice,
TET.gap_filling,
TET.true_false,
TET.short_answer,
TET.calculation,
- TET.score,
- TET.deduct_type,
- TET.create_user,
- TET.create_time,
TET.single_score,
TET.multiple_score,
TET.gap_score,
@@ -62,19 +50,13 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
- TET.name,
- TET.subject_id,
- TET.suggest_time,
+ TET.exam_paper_id,
TET.single_choice,
TET.multiple_choice,
TET.gap_filling,
TET.true_false,
TET.short_answer,
TET.calculation,
- TET.score,
- TET.deduct_type,
- TET.create_user,
- TET.create_time,
TET.single_score,
TET.multiple_score,
TET.gap_score,
--
Gitblit v1.8.0