From c9bc6e1989866c9b1958c3bfd5279e4d9bb16a6f Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Fri, 26 Feb 2021 17:51:39 +0800
Subject: [PATCH 1/4] =?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

---
 src/main/java/com/msdw/tms/dao/UserDao.java         |  2 +-
 src/main/resources/mapper/tms/StudentDao.xml        |  2 +-
 src/main/resources/mapper/tms/UserInfoDao.xml       |  4 ++--
 .../msdw/tms/service/AchievementManagementTest.java | 13 +++++--------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/UserDao.java b/src/main/java/com/msdw/tms/dao/UserDao.java
index 20c28b6..876d757 100644
--- a/src/main/java/com/msdw/tms/dao/UserDao.java
+++ b/src/main/java/com/msdw/tms/dao/UserDao.java
@@ -41,7 +41,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
 
     List<String> findPhoneSetTime(String phone, String checkCode,Integer types);
 
-    boolean saveCheckPhoneCode(CheckVo checkVo);
+//    boolean saveCheckPhoneCode(CheckVo checkVo);
 
     List<Integer> queryPhone(CheckVo checkVo);
 }
diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml
index 9d14baa..349554a 100644
--- a/src/main/resources/mapper/tms/StudentDao.xml
+++ b/src/main/resources/mapper/tms/StudentDao.xml
@@ -43,7 +43,7 @@
 		AND u.isdel = 0
 		AND l.isdel = 0
 		AND s.isdel = 0
-		<if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+		<if test="searchContent!=null">AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
 		ORDER BY
 		lastLoginTime DESC,studentId DESC
 	</select>
diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml
index fa949fc..5ec1bd1 100644
--- a/src/main/resources/mapper/tms/UserInfoDao.xml
+++ b/src/main/resources/mapper/tms/UserInfoDao.xml
@@ -215,7 +215,7 @@
     </update>
 
     <select id="queryPersonalFileES" parameterType="com.msdw.tms.entity.UserPersonalFileEntity"
-            resultType="hashMap">
+            resultType="com.msdw.tms.entity.vo.UserProsonalEntityVo">
 		SELECT
 			personalFileId,
 			schoolId,
@@ -233,7 +233,7 @@
 			userId = #{userId}
 	</select>
     <select id="queryPersonalInfo" parameterType="com.msdw.tms.entity.UserInfoEntity"
-            resultType="hashMap">
+            resultType="com.msdw.tms.entity.vo.UserProsonalEntityVo">
         SELECT
 	        u.userId,
 	        userName,
diff --git a/src/test/java/com/msdw/tms/service/AchievementManagementTest.java b/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
index 72e8d43..64f23e9 100644
--- a/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
+++ b/src/test/java/com/msdw/tms/service/AchievementManagementTest.java
@@ -2,17 +2,14 @@ package com.msdw.tms.service;
 
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.dao.AchievementManagementDao;
-import com.msdw.tms.entity.ProjectEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
 import com.msdw.tms.entity.request.AchievementImportRequest;
-import com.msdw.tms.entity.vo.AchievementManagementVo;
-import com.msdw.tms.entity.vo.SearchAchievementVo;
+import com.msdw.tms.entity.vo.AchievementManagementVO;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @SpringBootTest
@@ -30,7 +27,7 @@ public class AchievementManagementTest {
     //测试新增实验记录
 //    @Test
 //    public void addReport(){
-//        AchievementManagementVo vo = new AchievementManagementVo();
+//        AchievementManagementVO vo = new AchievementManagementVO();
 //        ProjectRecordEntity entity = new ProjectRecordEntity();
 //        Date date = new Date();
 //        //用户id
@@ -86,7 +83,7 @@ public class AchievementManagementTest {
     public void daleteReport(){
         Integer reportId = 4;
         Integer recordId = 100;
-        AchievementManagementVo vo = new AchievementManagementVo();
+        AchievementManagementVO vo = new AchievementManagementVO();
         ProjectRecordEntity entity = new ProjectRecordEntity();
         entity.setRecordid(recordId);
         vo.setReportId(reportId);
@@ -116,7 +113,7 @@ public class AchievementManagementTest {
         String staingTime = "";
         String endTime = "";
         List<Integer> list = achievementManagementDao.countEducationProjectId();
-        List<AchievementManagementVo> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
+        List<AchievementManagementVO> result = achievementManagementDao.queryEducationRecord(systemId, searchContent, staingTime, endTime, month, list);
         System.out.println(result);
     }
     //筛选查询-虚拟实验
@@ -128,7 +125,7 @@ public class AchievementManagementTest {
         String staingTime = "";
         String endTime = "";
         List<Integer> list = achievementManagementDao.countFictitiousProjectId();
-        List<AchievementManagementVo> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
+        List<AchievementManagementVO> result = achievementManagementDao.queryFictitiousRecord(systemId, searchContent, staingTime, endTime, month, list);
         System.out.println(result);
     }
 

From ce20c1ab84ca3fe54c27fcea77e01064594ba570 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Wed, 3 Mar 2021 10:15:04 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=9D=87=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tms/dao/AchievementManagementDao.java     |  5 +-
 .../AchievementManagementServiceImpl.java     | 76 ++++++++++---------
 .../mapper/tms/AchievementManagementDao.xml   |  4 +
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
index 08ff0f9..d0f8240 100644
--- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
+++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
@@ -51,6 +51,9 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
 
     IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);
 
+    //实验成绩管理查看成绩 统计平均分
+    String getAVG(Integer projectId);
+
     List<AchievementImportRequest> queryAchievement(@Param("ids") List<Integer> ids);
 
     List<AchievementManagementVO> queryFictitiousRecord(Integer systemId, String searchContant, String startingtime, String endtime, Integer month, List<Integer> projectIds);
@@ -71,5 +74,5 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
 
     List<AchievementManagementVO> queryPythonTest(Integer eventId);
 
-    void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment);
+    void updateSignatrue(Integer isSignature, Integer signatureId, Integer reportId, String comment);
 }
diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
index 97bd1e8..f4cab69 100644
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.*;
+
 @Slf4j
 @Service
 public class AchievementManagementServiceImpl extends ServiceImpl<AchievementManagementDao, ExperimentalReportEntity> implements AchievementManagementService {
@@ -58,39 +59,39 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         experimentalReportEntity.setReportId(reportId);
         ExperimentalReportEntity experimentalReportEntity1 = baseMapper.getReport(experimentalReportEntity);
         List<UserScoreVO> score = baseMapper.getScore(userScoreVO);
-        obj.put("score",score);
-        obj.put("experimentalReportEntity",experimentalReportEntity1);
+        obj.put("score", score);
+        obj.put("experimentalReportEntity", experimentalReportEntity1);
         List<Integer> tradingJudgmentPointsIds = baseMapper.queryTradingJudgmentPointsId(reportId);
         Integer size = tradingJudgmentPointsIds.size();
-        for (int i = 0;i<size; i++){
+        for (int i = 0; i < size; i++) {
             Integer tradingJudgmentPointsId = tradingJudgmentPointsIds.get(i);
             List<JudgmentPointsRuleVO> judgmentPointsRuleList = baseMapper.getUserAnswers(tradingJudgmentPointsId);
-            map.put("judgmentPointsRuleList"+i,judgmentPointsRuleList);
+            map.put("judgmentPointsRuleList" + i, judgmentPointsRuleList);
         }
-        obj.put("userAnswersList",map);
-        return R.ok().put("data",obj);
+        obj.put("userAnswersList", map);
+        return R.ok().put("data", obj);
     }
 
     @Override
     public R getTeacher(Integer projectId) {
         String name = baseMapper.getTeacher(projectId);
-        return R.ok().put("name",name);
+        return R.ok().put("name", name);
     }
 
     @Override
-    public List<ResultsEntity> list(ResultsVo vo,Integer page,Integer size) {
+    public List<ResultsEntity> list(ResultsVo vo, Integer page, Integer size) {
         List<ResultsEntity> list = achievementManagementDao.list(vo);
         return list;
     }
 
     @Override
-    public List<ReportEntity> reportList(ResultsVo vo,Integer page,Integer size) {
+    public List<ReportEntity> reportList(ResultsVo vo, Integer page, Integer size) {
         List<ReportEntity> reportList = achievementManagementDao.reportList(vo);
         return reportList;
     }
 
     @Override
-    public List<ResultsEntity> newList(ResultsVo vo,Integer page,Integer size) {
+    public List<ResultsEntity> newList(ResultsVo vo, Integer page, Integer size) {
         List<ResultsEntity> newList = achievementManagementDao.newList(vo);
         return newList;
     }
@@ -152,20 +153,20 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         Integer eventId = report.getEventId();
         ProjectRecordEntity record = projectRecordDao.queryReport(eventId);
         String userName = userInfoDao.queryUserReport(record.getUserid());
-        if (report.getProjectId()!=null){
+        if (report.getProjectId() != null) {
             String evaluationName = achievementManagementDao.queryEvaluationName(report.getProjectId());
             report.setEvaluationName(evaluationName);
         }
         //python实验数据
         Integer systemId = report.getSystemId();
-        if (systemId==1|systemId==4|systemId==5) {
+        if (systemId == 1 | systemId == 4 | systemId == 5) {
             List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(eventId);
             map.put("data", data);
         }
         report.setUserName(userName);
-        map.put("report",report);
-        map.put("record",record);
-        return R.ok().put("data",map);
+        map.put("report", report);
+        map.put("record", record);
+        return R.ok().put("data", map);
     }
 
     @Override
@@ -176,12 +177,17 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
     }
 
     @Override
-    public R queryEvaluationReport(String searchContant,Integer projectId,Integer page,Integer size) {
-        Page<T> tPage = new Page<>(page,size);
-        IPage<AchievementManagementVO> data = achievementManagementDao.queryEvaluationReport(tPage,searchContant,projectId);
+    public R queryEvaluationReport(String searchContant, Integer projectId, Integer page, Integer size) {
+        Page<T> tPage = new Page<>(page, size);
+        IPage<AchievementManagementVO> data = achievementManagementDao.queryEvaluationReport(tPage, searchContant, projectId);
+
+
+        String avg = achievementManagementDao.getAVG(projectId);
+
+
         PageUtils result = new PageUtils(data);
 
-        return R.ok().put("data",result);
+        return R.ok().put("data", result).put("avg", avg);
     }
 
     @Override
@@ -190,10 +196,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         List<Integer> list = new ArrayList<>();
 
         String[] split = ids.split(",");
-        for (int i = 0;i<split.length;i++){
+        for (int i = 0; i < split.length; i++) {
             list.add(Integer.parseInt(split[i]));
         }
-        List<AchievementImportRequest> achievement =  achievementManagementDao.queryAchievement(list);
+        List<AchievementImportRequest> achievement = achievementManagementDao.queryAchievement(list);
 
         //2.加载模板流数据
         ClassPathResource resource = new ClassPathResource("excel-template/川大成绩管理实验记录导出模板.xlsx");
@@ -205,7 +211,7 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
     }
 
     @Override
-    public R queryAchievement(Integer systemId,Integer projectPermissions, String searchContant, String startingtime,
+    public R queryAchievement(Integer systemId, Integer projectPermissions, String searchContant, String startingtime,
                               String endtime, Integer month) {
         try {
             List<AchievementManagementVO> fictitious;
@@ -213,14 +219,16 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
             List<AchievementManagementVO> vo = new ArrayList<>();
             List<Integer> educationResult = achievementManagementDao.countEducationProjectId();//获取教学实验的主键id
             List<Integer> fictitiousResult = achievementManagementDao.countFictitiousProjectId();//获取教学实验的主键id
-            if (projectPermissions==null){projectPermissions=-9999;}
-            if (projectPermissions==0){//只查询练习项目
+            if (projectPermissions == null) {
+                projectPermissions = -9999;
+            }
+            if (projectPermissions == 0) {//只查询练习项目
                 fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult);
                 vo = fictitious;
-            }else if (projectPermissions==1){//只查询考核项目
+            } else if (projectPermissions == 1) {//只查询考核项目
                 education = achievementManagementDao.queryEducationRecord(systemId, searchContant, startingtime, endtime, month, educationResult);
                 vo = education;
-            }else {//查询练习+考核项目
+            } else {//查询练习+考核项目
                 if (educationResult.size() == 0) {
                     if (fictitiousResult.size() > 0) {
                         fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult);
@@ -245,10 +253,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
                     }
                 }
             }
-            return R.ok().put("data",vo);
-        }catch (RuntimeException e){
+            return R.ok().put("data", vo);
+        } catch (RuntimeException e) {
             log.info(e.getMessage());
-            return R.error(500,"系统异常！！！");
+            return R.error(500, "系统异常！！！");
         }
     }
 
@@ -267,13 +275,13 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         Integer signatureId = entity.getSignatureId();
         Integer reportId = entity.getReportId();
         String comment = entity.getComment();
-        if (comment==""){
+        if (comment == "") {
             comment = null;
         }
-        if (isSignature==1){
-            achievementManagementDao.updateSignatrue(1,signatureId,reportId,comment);
-        }else {
-            achievementManagementDao.updateSignatrue(0,null,reportId,comment);
+        if (isSignature == 1) {
+            achievementManagementDao.updateSignatrue(1, signatureId, reportId, comment);
+        } else {
+            achievementManagementDao.updateSignatrue(0, null, reportId, comment);
         }
     }
 
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 8b21be1..ebc5a4d 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -166,6 +166,10 @@
         ORDER BY tpr.submitTime DESC
     </select>
 
+    <select id="getAVG" parameterType="java.lang.Integer" resultType="java.lang.String">
+        SELECT AVG(score) from tms_project_record WHERE projectId = #{projectId}
+    </select>
+
     <select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest">
         SELECT
         u.userName,

From a38fac4b1860b4a4595c6bd47080033321043a90 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Wed, 3 Mar 2021 15:19:03 +0800
Subject: [PATCH 3/4] =?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

---
 .../tms/dao/AchievementManagementDao.java     |  2 -
 .../AchievementManagementServiceImpl.java     |  5 +--
 .../mapper/tms/AchievementManagementDao.xml   | 43 ++++++++++++++++---
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
index d0f8240..2278016 100644
--- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
+++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
@@ -51,8 +51,6 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
 
     IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);
 
-    //实验成绩管理查看成绩 统计平均分
-    String getAVG(Integer projectId);
 
     List<AchievementImportRequest> queryAchievement(@Param("ids") List<Integer> ids);
 
diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
index f4cab69..bd56f57 100644
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@@ -182,12 +182,9 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         IPage<AchievementManagementVO> data = achievementManagementDao.queryEvaluationReport(tPage, searchContant, projectId);
 
 
-        String avg = achievementManagementDao.getAVG(projectId);
-
-
         PageUtils result = new PageUtils(data);
 
-        return R.ok().put("data", result).put("avg", avg);
+        return R.ok().put("data", result);
     }
 
     @Override
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 2f1ce13..2c92eaf 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -132,8 +132,9 @@
                  LEFT JOIN hr_project_management AS hpm ON hpm.projectId = tpr.projectId
         WHERE reportId = #{reportId}
     </select>
-    <select id="queryEvaluationReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
-        SELECT
+
+    <!--
+    SELECT
         u.userName,
         sch.schoolName,
         s.workNumber,
@@ -158,17 +159,45 @@
         AND tcr.isdel = 0
         AND u.isdel = 0
         AND tpr.projectId = #{projectId}
-        <if test="searchContant!=null and searchContant!=''">AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%')
+        <if test="searchContant!=null and searchContant!=''">
+          AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%')
             OR u.userName LIKE CONCAT('%',#{searchContant},'%') )
         </if>
         GROUP BY
         tcr.reportId
         ORDER BY tpr.submitTime DESC
+    -->
+    <select id="queryEvaluationReport" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
+        SELECT
+        r.reportId,
+        re.recordId,
+        sch.schoolName,
+        s.workNumber,
+        u.userName,
+        re.score,
+        re.submitTime,
+        r.eventId
+        FROM
+        tms_experimental_report r
+        INNER JOIN tms_experimental_teaching t ON t.id = r.projectId
+        INNER JOIN student s ON s.studentId = r.studentId
+        INNER JOIN school sch ON sch.schoolId = s.schoolId
+        INNER JOIN hr_user_info u ON u.userId = s.userId
+        INNER JOIN tms_project_record re ON re.projectId = t.project_id
+        WHERE
+        t.id = r.projectId
+        and r.eventId = re.recordId
+        AND r.projectId = #{projectId}
+        AND r.isdel = 0
+        AND t.is_del = 0
+        AND u.isdel = 0
+        <if test="searchContant!=null and searchContant!=''">
+            AND (sch.schoolName LIKE CONCAT('%',#{searchContant},'%')
+            OR u.userName LIKE CONCAT('%',#{searchContant},'%') )
+        </if>
+        GROUP BY r.reportId DESC
     </select>
 
-    <select id="getAVG" parameterType="java.lang.Integer" resultType="java.lang.String">
-        SELECT AVG(score) from tms_project_record WHERE projectId = #{projectId}
-    </select>
 
     <select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest">
         SELECT
@@ -366,7 +395,7 @@
         tms_project_record her where hpm.projectId = her.projectId ) as number
         FROM hr_project_management hpm WHERE systemId = #{systemId}
         AND hpm.isdel = 0
-        <if test="projectPermissions!=null and projectPermissions!=''">AND hpm.projectPermissions =
+        <if test="projectPermissions!=null and projectPermissions!=''">AND hpm.projectPer missions =
             #{projectPermissions}
         </if>
         <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')

From 74ef0ce875215c35bbce1712a31149f3a41c419e Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Wed, 3 Mar 2021 15:48:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=9E=E9=AA=8C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/msdw/tms/api/ProjectRcordControllerApi.java | 2 +-
 .../com/msdw/tms/controller/ProjectRecordController.java | 4 ++--
 src/main/java/com/msdw/tms/dao/ProjectRecordDao.java     | 2 +-
 .../com/msdw/tms/entity/resp/GetByUserRecordResp.java    | 9 +++++++++
 .../java/com/msdw/tms/service/ProjectRecordService.java  | 2 +-
 .../msdw/tms/service/impl/ProjectRecordServiceImpl.java  | 4 ++--
 src/main/resources/mapper/tms/ProjectRecordDao.xml       | 4 +++-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/msdw/tms/api/ProjectRcordControllerApi.java b/src/main/java/com/msdw/tms/api/ProjectRcordControllerApi.java
index 44f3b3a..2214022 100644
--- a/src/main/java/com/msdw/tms/api/ProjectRcordControllerApi.java
+++ b/src/main/java/com/msdw/tms/api/ProjectRcordControllerApi.java
@@ -18,7 +18,7 @@ public interface ProjectRcordControllerApi {
             Integer recordState,String condition);
 
     @ApiOperation(value = "用户端虚拟仿真实验记录",notes = "用户端虚拟仿真实验记录")
-    R queryUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions);
+    R queryUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId);
 
     @ApiOperation(value = "用户端教学实验记录",notes = "用户端教学实验记录")
     R getUserExperimentscore(Integer page,Integer size,Integer userid);
diff --git a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
index 0235cb4..9f1d364 100644
--- a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
+++ b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
@@ -63,8 +63,8 @@ public class ProjectRecordController implements ProjectRcordControllerApi {
      */
     @Override
     @GetMapping("/user/record")
-    public R queryUserRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions){
-        PageUtils page1 = projectRecordService.queryPage(page,size,userId,projectPermissions);
+    public R queryUserRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions,@RequestParam Integer systemId){
+        PageUtils page1 = projectRecordService.queryPage(page,size,userId,projectPermissions,systemId);
         return R.ok().put("data", page1);
     }
 
diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
index 4d4f96b..6cfa531 100644
--- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
+++ b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
@@ -23,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface ProjectRecordDao extends BaseMapper<ProjectRecordEntity> {
 
-    IPage<GetByUserRecordResp> getByUserRecord(Page page, @Param("userId") Integer userId, @Param("projectPermissions") Integer projectPermissions);
+    IPage<GetByUserRecordResp> getByUserRecord(Page page, @Param("userId") Integer userId, @Param("projectPermissions") Integer projectPermissions,@Param("systemId") Integer systemId);
 
     IPage<ProjectRecordVo> getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity);
 
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 5155336..386b14b 100644
--- a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
+++ b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java
@@ -22,6 +22,15 @@ public class GetByUserRecordResp {
     private String submitTime;
     private Integer timeSum;
     private Integer userId;
+    private Integer systemId;
+
+    public Integer getSystemId() {
+        return systemId;
+    }
+
+    public void setSystemId(Integer systemId) {
+        this.systemId = systemId;
+    }
 
     public String getProjectName() {
         return projectName;
diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
index 780ad3d..377cc13 100644
--- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java
+++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface ProjectRecordService extends IService<ProjectRecordEntity> {
 
-    PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions);
+    PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions,Integer systemId);
 
     PageUtils queryExperimentPage(Integer page, Integer size, Integer userid);
 
diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
index 211960c..255a4ba 100644
--- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
@@ -38,7 +38,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
 
 
     @Override
-    public PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions) {
+    public PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions,Integer systemId) {
 
         /*GetByUserRecordResp projectRecord = new GetByUserRecordResp();
         projectRecord.setUserId(userId);*/
@@ -46,7 +46,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         //分页对象
         Page<T> page1 = new Page<>(page, size);
 
-        IPage<GetByUserRecordResp> projectRecordVos = this.baseMapper.getByUserRecord(page1, userId, projectPermissions);
+        IPage<GetByUserRecordResp> projectRecordVos = this.baseMapper.getByUserRecord(page1, userId, projectPermissions,systemId);
 
         PageUtils questionsPage = new PageUtils(projectRecordVos);
 
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index 5b67e32..07900c6 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -52,13 +52,15 @@
                r.startingTime,
                r.submitTime,
                r.timeSum,
-               c.userId
+               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
         WHERE c.userId = #{userId}
           and r.isdel = 0
           and projectPermissions = #{projectPermissions}
+          and t.systemId = #{systemId}
         GROUP BY c.recordId desc
     </select>