From f54c577673ed17d2cf8d8b8354024dc22f31bfe7 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Thu, 4 Mar 2021 16:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/msdw/tms/entity/resp/GetByUserRecordResp.java    | 9 +++++++++
 src/main/resources/mapper/tms/ProjectRecordDao.xml       | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
index 386b14b..74a4be1 100644
--- a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
+++ b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
@@ -23,6 +23,7 @@ public class GetByUserRecordResp {
     private Integer timeSum;
     private Integer userId;
     private Integer systemId;
+    private Integer reportId;
 
     public Integer getSystemId() {
         return systemId;
@@ -95,4 +96,12 @@ public class GetByUserRecordResp {
     public void setUserId(Integer userId) {
         this.userId = userId;
     }
+
+    public Integer getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Integer reportId) {
+        this.reportId = reportId;
+    }
 }
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index bb906fe..7695449 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -45,7 +45,8 @@
     -->
     <select id="getByUserRecord" resultType="com.msdw.tms.entity.resp.GetByUserRecordResp"
             parameterType="java.lang.Integer">
-        SELECT projectName,
+        SELECT re.reportId,
+               projectName,
                c.recordId,
                r.score,
                c.codeId,
@@ -57,6 +58,7 @@
         FROM hr_experiment_code c
                  INNER JOIN hr_project_management t ON t.projectId = c.projectId
                  INNER JOIN tms_project_record r ON r.recordId = c.recordId
+                 INNER JOIN tms_experimental_report re ON re.eventId = r.recordId
         WHERE c.userId = #{userId}
 --         教师端逻辑删除，学生端不做判断
 --           and r.isdel = 0
@@ -83,7 +85,7 @@
                  LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId
                  LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
         WHERE tpr.userId = #{pro.userid}
-           AND tpr.isdel >= #{pro.isdel}
+          AND tpr.isdel >= #{pro.isdel}
           AND tp.projectPermissions !=0
         AND
             ter.eventId = tpr.recordId