From da5c72bf647f959988e5112b254d514d2c580809 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Thu, 4 Mar 2021 15:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=95=99=E5=AD=A6=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/tms/AchievementManagementDao.xml   | 56 +++++++++++++------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 7b35c6a..56f8fb7 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -84,7 +84,8 @@
     <update id="deleteReport">
         UPDATE tms_project_record tpr,tms_experimental_report ter
         SET tpr.isdel = 1, ter.isdel = 1
-        WHERE tpr.recordId = #{recordId} AND ter.reportId = #{reportId}
+        WHERE tpr.recordId = #{recordId}
+          AND ter.reportId = #{reportId}
     </update>
     <update id="updateComment">
         UPDATE tms_experimental_report
@@ -371,7 +372,7 @@
         WHERE project_id = #{projectId}
     </select>
     <select id="queryPythonTest" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-        SELECT hec.`code` AS userAnswer,
+        SELECT hec.`code`                              AS userAnswer,
                hec.codeId,
                IF
                    (p.rightAndWrong = 0, hsi.score, 0) AS codeScore,
@@ -503,22 +504,43 @@
           AND re.isdel = 0;
     </select>
 
+
+    <!--SELECT r.recordId, schoolName,tet.experimental_class_name, userName, workNumber, score, submitTime, ter.reportId
+    from tms_project_record r
+    inner join student s on s.userId = r.userId
+    inner join hr_user_info u on u.userId = r.userId
+    inner join school sch on sch.schoolId = u.schoolId
+    inner join tms_experimental_report ter on r.recordId = ter.eventId
+    inner join tms_experimental_teaching tet on r.projectId = tet.project_id
+    WHERE
+    tet.id = #{id}
+    AND r.isdel = 0
+    AND s.isdel = 0
+    AND u.isdel = 0
+    AND sch.isdel = 0
+    AND ter.isdel = 0
+    AND tet.is_del = 0-->
     <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-        SELECT r.recordId, schoolName,tet.experimental_class_name, userName, workNumber, score, submitTime, ter.reportId
-        from tms_project_record r
-                 inner join student s on s.userId = r.userId
-                 inner join hr_user_info u on u.userId = r.userId
-                 inner join school sch on sch.schoolId = u.schoolId
-				 inner join tms_experimental_report ter on r.recordId = ter.eventId
-				 inner join tms_experimental_teaching tet on r.projectId = tet.project_id
-        WHERE
-				tet.id = #{id}
-		AND r.isdel = 0
-        AND s.isdel = 0
-        AND u.isdel = 0
-        AND sch.isdel = 0
-        AND ter.isdel = 0
-        AND tet.is_del = 0
+        SELECT schoolName,
+               experimental_class_name,
+               userName,
+               workNumber,
+               r.score,
+               r.recordId,
+               report.reportId
+        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
+          AND r.isdel = 0
+          AND u.isdel = 0
+          AND s.isdel = 0
+          AND stu.isdel = 0;
 
     </select>