From 0710ea54a6f6b463aab0a95c9147cddd00e36918 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Thu, 4 Mar 2021 10:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=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    |  8 +++---
 .../mapper/tms/AchievementManagementDao.xml   | 27 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 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 91bc8bd..5c87f50 100644
--- a/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
+++ b/src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
@@ -32,7 +32,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
     //提交时间
     private String submitTime;
 
-//===========================================================    返回参数
+    //===========================================================    返回参数
     //项目名称
     private String projectName;
 
@@ -46,7 +46,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
     private String creationTime;
 
     //类型（1虚拟仿真，2教学实验）
-    private  Integer type;
+    private Integer type;
     //
     private Integer projectPermissions;
     //创建时间
@@ -55,6 +55,8 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
     //实验记录id（tms_experimental_report主键）
     private Integer recordId;
 
+    private Integer reportId;
+
     //老师签名 存放路径
     private String signatureUrl;
     //签名名称
@@ -72,7 +74,7 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
     //平台id
     private Integer systemId;
 
-//===========================================================    python实验数据
+    //===========================================================    python实验数据
     //判分点id
     private Integer codeId;
     //判分点-得分
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 7a50e76..b629038 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,hr_experimental_report tcr
         SET tpr.isdel = 1, tcr.isdel = 1
-        WHERE tpr.recordId = #{recordId} AND tcr.reportId = #{reportId}
+        WHERE tpr.recordId = #{recordId}
+          AND tcr.reportId = #{reportId}
     </update>
     <update id="updateComment">
         UPDATE tms_experimental_report
@@ -483,12 +484,24 @@
     </update>
 
     <select id="getImitationAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-        SELECT r.recordId, schoolName, userName, workNumber, score, submitTime
-        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
-        WHERE r.projectId = #{projectId};
+        SELECT r.recordId,
+               schoolName,
+               userName,
+               workNumber,
+               score,
+               submitTime,
+               re.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 re on r.recordId = re.eventId
+        WHERE r.projectId = #{projectId}
+          AND r.isdel = 0
+          AND s.isdel = 0
+          AND u.isdel = 0
+          AND sch.isdel = 0
+          AND re.isdel = 0;
     </select>
 
 </mapper>
\ No newline at end of file