From 3d14660dcb6d037631335568343a02b91691cce1 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Tue, 16 Mar 2021 14:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=88=90=E7=BB=A9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E7=94=9Fid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/msdw/tms/entity/vo/AchievementManagementVO.java  | 3 +++
 src/main/resources/mapper/tms/AchievementManagementDao.xml    | 3 ++-
 src/main/resources/mapper/tms/ExperimentalReportDao.xml       | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
index e5e2fa5..6cf318a 100644
--- a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
+++ b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
@@ -88,4 +88,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
     private String answer;
     //判分点名称
     private String judgmentPointsName;
+
+    //学生id
+    private Integer studentId;
 }
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index c2a1330..e408af8 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -177,7 +177,8 @@
         u.userName,
         re.score,
         re.submitTime,
-        r.eventId
+        r.eventId,
+        s.studentId
         FROM
         tms_experimental_report r
         INNER JOIN tms_experimental_teaching t ON t.id = r.projectId
diff --git a/src/main/resources/mapper/tms/ExperimentalReportDao.xml b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
index c6dbaaa..69d14da 100644
--- a/src/main/resources/mapper/tms/ExperimentalReportDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
@@ -30,7 +30,8 @@
                ter.improvement,
                IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment,
                ter.instructor,
-	           ter.purpose
+	           ter.purpose,
+               tet.experimental_class_name as experimentalClassName
         FROM hr_user_info u,
              student stu,
              tms_experimental_report ter,
@@ -48,6 +49,7 @@
           AND tpr.recordId = #{recordId}
           AND ter.projectId = #{projectId}
     </select>
+
     <select id="queryVirtualReport" resultType="com.msdw.tms.entity.vo.ExperimentalReportVo">
         SELECT
             tpr.recordId,