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}