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

---
 .../tms/service/ProjectRecordService.java     |  1 +
 .../resources/mapper/tms/ProjectRecordDao.xml | 77 ++++++++++---------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
index d031075..a598ede 100644
--- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java
+++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
@@ -22,6 +22,7 @@ public interface ProjectRecordService extends IService<ProjectRecordEntity> {
 
     PageUtils queryExperimentPage(Integer page, Integer size, Integer userid,Integer systemId);
 
+    //学生端实验概览
     ProjectRecordVo queryUserScore(Integer userId);
 
     ProjectRecordVo queryScore(Integer userId);
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index a1895d8..d3a2851 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -40,56 +40,61 @@
     </select>
 
 
+    <!--练习记录-->
     <select id="getByUserRecord" resultType="com.msdw.tms.entity.resp.GetByUserRecordResp"
             parameterType="java.lang.Integer">
         SELECT re.reportId,
-               projectName,
-               c.recordId,
-               r.score,
-               c.codeId,
-               r.startingTime,
-               r.submitTime,
-               r.timeSum,
-               c.userId,
-               t.systemId
+        projectName,
+        c.recordId,
+        r.score,
+        c.codeId,
+        r.startingTime,
+        r.submitTime,
+        r.timeSum,
+        c.userId,
+        t.systemId
         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
+        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
-          and projectPermissions = #{projectPermissions}
-          and t.systemId = #{systemId}
+        -- 教师端逻辑删除，学生端不做判断
+        -- and r.isdel = 0
+        and projectPermissions = #{projectPermissions}
+        <if test="systemId!=null and systemId!=''">
+            and t.systemId = #{systemId}
+        </if>
         GROUP BY c.recordId desc
     </select>
 
-    <!--    -->
+    <!--  考核记录  -->
     <select id="getByUserExperimentRecord" resultType="com.msdw.tms.entity.vo.ProjectRecordVo">
         SELECT tet.id,
-               ter.reportId,
-               tpr.recordId,
-               tpr.projectId,
-               tp.projectName,
-               score,
-               timeSum,
-               startingTime                as startTime,
-               endTime,
-               recordState,
-               tet.experimental_class_name as experimentalClassName,
-               systemId
+        ter.reportId,
+        tpr.recordId,
+        tpr.projectId,
+        tp.projectName,
+        score,
+        timeSum,
+        startingTime as startTime,
+        endTime,
+        recordState,
+        tet.experimental_class_name as experimentalClassName,
+        systemId
         FROM tms_project_record tpr
-                 LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
-                 LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId
-                 LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
+        LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+        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 systemId = #{systemId}
-          AND tpr.isdel >= #{pro.isdel}
-          AND tp.projectPermissions !=0
+
+        <if test="systemId!=null and systemId!=''">and systemId = #{systemId}</if>
+
+        AND tpr.isdel >= #{pro.isdel}
+        AND tp.projectPermissions !=0
         AND
-            ter.eventId = tpr.recordId
+        ter.eventId = tpr.recordId
         ORDER BY
-            tpr.recordId DESC
+        tpr.recordId DESC
     </select>
 
     <select id="getByUserRecordImport" resultType="com.msdw.tms.entity.vo.ProjectRecordExportVo">