From fef86bbf6c13195873c644d1aeed99b47065e754 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Wed, 10 Mar 2021 11:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A2=9E=E5=8A=A0=E8=80=83=E6=A0=B8=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/AchievementManagementVO.java    |   3 +
 .../mapper/tms/AchievementManagementDao.xml   | 105 +++++++++---------
 2 files changed, 56 insertions(+), 52 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 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>
 
-<!--    <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">-->
-<!--        SELECT-->
-<!--        et.id,-->
-<!--        et.experimental_class_name AS experimentalClassName,-->
-<!--        et.experimental_name AS experimentalName,-->
-<!--        et.project_id AS projectId,-->
-<!--        pm.projectName,-->
-<!--        pm.projectPermissions,-->
-<!--        et.creation_time AS creationTime,-->
-<!--        ( SELECT count( * ) FROM tms_experimental_report her WHERE et.id = her.projectId AND her.isdel = 0 ) AS number,-->
-<!--        et.is_del-->
-<!--        FROM-->
-<!--        tms_experimental_teaching et,-->
-<!--        hr_project_management pm-->
-<!--        WHERE-->
-<!--        user_id = #{userId}-->
-<!--        AND et.project_id = pm.projectId-->
-<!--        AND pm.isdel = 0-->
-<!--        <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like-->
-<!--            concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or-->
-<!--            pm.projectName like concat('%',#{searchContant},'%')-->
-<!--        </if>-->
-<!--        <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between-->
-<!--            #{endTime} and #{startTime}-->
-<!--        </if>-->
-<!--        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=-->
-<!--            date(et.creation_time)-->
-<!--        </if>-->
-<!--        ORDER BY et.creation_time DESC-->
-<!--    </select>-->
+    <!--    <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">-->
+    <!--        SELECT-->
+    <!--        et.id,-->
+    <!--        et.experimental_class_name AS experimentalClassName,-->
+    <!--        et.experimental_name AS experimentalName,-->
+    <!--        et.project_id AS projectId,-->
+    <!--        pm.projectName,-->
+    <!--        pm.projectPermissions,-->
+    <!--        et.creation_time AS creationTime,-->
+    <!--        ( SELECT count( * ) FROM tms_experimental_report her WHERE et.id = her.projectId AND her.isdel = 0 ) AS number,-->
+    <!--        et.is_del-->
+    <!--        FROM-->
+    <!--        tms_experimental_teaching et,-->
+    <!--        hr_project_management pm-->
+    <!--        WHERE-->
+    <!--        user_id = #{userId}-->
+    <!--        AND et.project_id = pm.projectId-->
+    <!--        AND pm.isdel = 0-->
+    <!--        <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like-->
+    <!--            concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or-->
+    <!--            pm.projectName like concat('%',#{searchContant},'%')-->
+    <!--        </if>-->
+    <!--        <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between-->
+    <!--            #{endTime} and #{startTime}-->
+    <!--        </if>-->
+    <!--        <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=-->
+    <!--            date(et.creation_time)-->
+    <!--        </if>-->
+    <!--        ORDER BY et.creation_time DESC-->
+    <!--    </select>-->
 
     <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">
         SELECT
@@ -579,28 +579,28 @@
     AND sch.isdel = 0
     AND ter.isdel = 0
     AND tet.is_del = 0-->
-<!--    <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">-->
-<!--        SELECT schoolName,-->
-<!--               experimental_class_name,-->
-<!--               userName,-->
-<!--               workNumber,-->
-<!--               r.score,-->
-<!--               r.recordId,-->
-<!--               report.reportId,-->
-<!--               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-->
-<!--                 INNER JOIN hr_user_info u ON u.userId = r.userId-->
-<!--                 INNER JOIN school s ON s.schoolId = u.schoolId-->
-<!--                 INNER JOIN student stu ON stu.userId = u.userId-->
-<!--        WHERE t.id = #{id}-->
-<!--          AND t.is_del = 0-->
-<!--          AND report.isdel = 0-->
+    <!--    <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">-->
+    <!--        SELECT schoolName,-->
+    <!--               experimental_class_name,-->
+    <!--               userName,-->
+    <!--               workNumber,-->
+    <!--               r.score,-->
+    <!--               r.recordId,-->
+    <!--               report.reportId,-->
+    <!--               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-->
+    <!--                 INNER JOIN hr_user_info u ON u.userId = r.userId-->
+    <!--                 INNER JOIN school s ON s.schoolId = u.schoolId-->
+    <!--                 INNER JOIN student stu ON stu.userId = u.userId-->
+    <!--        WHERE t.id = #{id}-->
+    <!--          AND t.is_del = 0-->
+    <!--          AND report.isdel = 0-->
 
-<!--    </select>-->
+    <!--    </select>-->
 
     <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
         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