From 4d878071d7f797fec59aacc30b3cf4f66f32f4b4 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 24 May 2024 18:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=92=8C=E6=95=99=E8=82=B2?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/exam/mapper/xml/ExamTrainRecordMapper.xml | 11 +++++++----
 .../zhgd/xmgl/modules/exam/vo/ExamTrainRecordVo.java  |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
index 3b77d97b8..aa3e703fa 100644
--- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
@@ -3,19 +3,22 @@
 <mapper namespace="com.zhgd.xmgl.modules.exam.mapper.ExamTrainRecordMapper">
 
     <select id="pageList" resultType="com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo">
-        select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time, et.train_end_time, et.name trainName, et.duration examDuration
-                       from exam_train_record ec
+        select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time, et.train_end_time, et.name trainName, et.duration examDuration,
+                           p.name examPaperName from exam_train_record ec
             left join exam_train et on ec.train_id = et.id
             left join exam_subject es on et.subject_id = es.id
-            left join exam_course c on et.course_id = c.id) a
+            left join exam_course c on et.course_id = c.id
+            left join exam_paper p on et.exam_paper_id = p.id) a
             ${ew.customSqlSegment}
     </select>
 
     <select id="examPageList" resultType="com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo">
-        select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time, et.train_end_time, et.name trainName, et.duration examDuration from exam_train_record ec
+        select * from (select ec.*, et.exam_paper_id, et.course_id, es.name subjectName, et.title, et.train_begin_time, et.train_end_time, et.name trainName, et.duration examDuration,
+                              p.name examPaperName from exam_train_record ec
               left join exam_train et on ec.train_id = et.id
               left join exam_subject es on et.subject_id = es.id
               left join exam_course c on et.course_id = c.id
+              left join exam_paper p on et.exam_paper_id = p.id
               where et.exam_paper_id IS NOT NULL) a
             ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/vo/ExamTrainRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/exam/vo/ExamTrainRecordVo.java
index 67d4a520e..cd16e1218 100644
--- a/src/main/java/com/zhgd/xmgl/modules/exam/vo/ExamTrainRecordVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/exam/vo/ExamTrainRecordVo.java
@@ -22,6 +22,12 @@ public class ExamTrainRecordVo extends ExamTrainRecord {
     @ApiModelProperty(value = "试题id")
     private Long examPaperId;
 
+    /**
+     * 试题名称
+     */
+    @ApiModelProperty(value = "试题名称")
+    private String examPaperName;
+
     /**
      * 学习课程ID
      */