代码上传

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);

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -40,6 +40,7 @@
     </select>
 
 
+    <!--练习记录-->
     <select id="getByUserRecord" resultType="com.msdw.tms.entity.resp.GetByUserRecordResp"
             parameterType="java.lang.Integer">
         SELECT re.reportId,
@@ -57,14 +58,16 @@
         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 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,
@@ -83,7 +86,9 @@
         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}
+
+        <if test="systemId!=null and systemId!=''">and systemId = #{systemId}</if>
+
         AND tpr.isdel >= #{pro.isdel}
         AND tp.projectPermissions !=0
         AND