From 16fb8d60832a4a215099c14927100a82e81bac4f Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Thu, 4 Mar 2021 17:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AB=AF=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/tms/AchievementManagementDao.xml   |  4 +-
 .../mapper/tms/ExperimentalReportDao.xml      | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 3021099..e20f17d 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -536,7 +536,9 @@
                r.score,
                r.recordId,
                report.reportId,
-               r.submitTime
+               r.submitTime,
+               stu.studentId,
+			   t.id as projectId
         FROM tms_experimental_teaching t
                  INNER JOIN tms_experimental_report report ON report.projectId = t.id
                  INNER JOIN tms_project_record r ON r.recordId = report.eventId
diff --git a/src/main/resources/mapper/tms/ExperimentalReportDao.xml b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
index 7f087d8..bddc047 100644
--- a/src/main/resources/mapper/tms/ExperimentalReportDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalReportDao.xml
@@ -12,7 +12,7 @@
         SELECT u.userId,
                u.userName,
                stu.workNumber,
-               tet.project_name,
+               ter.proName,
                tet.id                                                                          AS experimentId,
                tet.experimental_class_name,
                hpm.experimentalGoal                                                            AS experiment_goal,
@@ -28,7 +28,9 @@
                ter.conclusion,
                ter.summarize,
                ter.improvement,
-               IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment
+               IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment,
+               ter.instructor,
+	           ter.purpose
         FROM hr_user_info u,
              student stu,
              tms_experimental_report ter,
@@ -47,23 +49,26 @@
           AND ter.projectId = #{projectId}
     </select>
     <select id="queryVirtualReport" resultType="com.msdw.tms.entity.vo.ExperimentalReportVo">
-        SELECT tpr.recordId,
-               u.userId,
-               u.userName,
-               stu.workNumber,
-               hpm.projectName,
-               hpm.experimentalGoal AS experiment_goal,
-               tpr.submitTime,
-               tpr.score
-        FROM hr_user_info u,
-             student stu,
-             hr_project_management hpm,
-             tms_project_record tpr
-        WHERE u.userId = stu.userId
-          AND stu.userId = tpr.userId
-          AND hpm.projectId = tpr.projectId
-          AND tpr.isdel = 0
-          AND tpr.recordId = #{recordId}
+        SELECT
+            tpr.recordId,
+            u.userId,
+            u.userName,
+            stu.workNumber,
+            ter.proName,
+            ter.purpose,
+            hpm.experimentalGoal AS experiment_goal,
+            tpr.submitTime,
+            tpr.score,
+            ter.instructor,
+            ter.period
+        FROM
+            tms_experimental_report ter
+            INNER JOIN student stu ON ter.studentId = stu.studentId
+            INNER JOIN hr_user_info u ON u.userId = stu.userId
+            INNER JOIN tms_project_record tpr ON tpr.recordId = ter.eventId
+            INNER JOIN hr_project_management hpm ON hpm.projectId = tpr.projectId
+            WHERE
+           tpr.recordId = #{recordId}
     </select>
     <select id="querySystemId" resultType="java.lang.Integer">
         SELECT systemId