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 5c87f50..e5e2fa5 100644 --- a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java @@ -20,6 +20,9 @@ public class AchievementManagementVO extends ExperimentalReportEntity { //实验班级 private String experimentalClassName; + //实验名称 + private String experimentalName; + //学生姓名 private String userName; diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 6be9400..a76089b 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -432,36 +432,36 @@ ORDER BY hpm.creationTime DESC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT schoolName, @@ -612,7 +612,8 @@ report.reportId, r.submitTime, stu.studentId, - t.id as projectId + t.id as projectId, + experimental_name as experimentalName 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