From c398ef0472b20616b6167753f70fba1acf09d90a Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Wed, 24 Mar 2021 14:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9E=E9=AA=8C=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E5=87=86=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectRecordController.java   |  7 +--
 .../com/msdw/tms/dao/ProjectRecordDao.java    |  7 +++
 .../tms/service/ProjectRecordService.java     |  7 +--
 .../impl/ProjectRecordServiceImpl.java        | 12 +++++
 .../resources/mapper/tms/ProjectRecordDao.xml | 50 +++++++++++++++++++
 5 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
index 1f8ecdf..14b035b 100644
--- a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
+++ b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java
@@ -8,6 +8,7 @@ import com.msdw.tms.entity.ProjectEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
 import com.msdw.tms.service.ProjectRecordService;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -57,7 +58,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi {
     }
 
     /**
-     * 用户端虚拟仿真实验记录
+     * 用户端虚拟仿真实验记录(练习列表)
      *
      * @param page
      * @param size
@@ -66,7 +67,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi {
      */
     @Override
     @GetMapping("/user/record")
-    public R queryUserRecord(@RequestParam Integer page, @RequestParam Integer size, @RequestParam Integer userId, @RequestParam Integer projectPermissions, @RequestParam Integer systemId) {
+    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);
     }
@@ -87,7 +88,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi {
     }
 
     /**
-     * 用户端教学实验记录
+     * 用户端教学实验记录（考核列表）
      *
      * @param page
      * @param size
diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
index c1a5785..a7b082e 100644
--- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
+++ b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java
@@ -46,4 +46,11 @@ public interface ProjectRecordDao extends BaseMapper<ProjectRecordEntity> {
     ProjectRecordEntity queryReport(Integer recordId);
 
     void updateScore(ProjectRecordEntity vo);
+
+    //练习统计
+    List<GetByUserRecordResp> sumByPracticeNum(Integer userId);
+
+    //考核统计
+    List<ProjectRecordVo> sumByAssessmentNum(Integer userId);
+
 }
diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
index a598ede..3a77782 100644
--- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java
+++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java
@@ -16,11 +16,11 @@ import java.util.List;
  * @date 2020-08-19 16:07:02
  */
 public interface ProjectRecordService extends IService<ProjectRecordEntity> {
-    PageUtils getByKDUserRecord(Integer page,Integer size,Integer userId,Integer projectPermissions,Integer systemId);
+    PageUtils getByKDUserRecord(Integer page, Integer size, Integer userId, Integer projectPermissions, Integer systemId);
 
-    PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions,Integer systemId);
+    PageUtils queryPage(Integer page, Integer size, Integer userId, Integer projectPermissions, Integer systemId);
 
-    PageUtils queryExperimentPage(Integer page, Integer size, Integer userid,Integer systemId);
+    PageUtils queryExperimentPage(Integer page, Integer size, Integer userid, Integer systemId);
 
     //学生端实验概览
     ProjectRecordVo queryUserScore(Integer userId);
@@ -36,5 +36,6 @@ public interface ProjectRecordService extends IService<ProjectRecordEntity> {
     boolean updateUserRecord(ProjectRecordEntity projectRecord);
 
     void updateScore(ProjectRecordEntity vo);
+
 }
 
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 972a7fa..543d8b6 100644
--- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
@@ -88,6 +88,16 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
 
         Integer isdel = Constant.IsDel.NOT_DEL.getType();
         ProjectRecordVo projectRecordVo = this.baseMapper.getByUserScore(userId, isdel);
+
+        //练习统计
+        List<GetByUserRecordResp> sumByPracticeNum = this.baseMapper.sumByPracticeNum(userId);
+
+        //考核统计
+        List<ProjectRecordVo> sumByAssessmentNum = this.baseMapper.sumByAssessmentNum(userId);
+
+        Integer numer = sumByPracticeNum.size() + sumByAssessmentNum.size();
+        projectRecordVo.setExperimentNumber(numer);
+
         Double totalTime = projectRecordVo.getTotalTime();
         if (totalTime != null) {
             DecimalFormat df = new DecimalFormat("0.00");
@@ -183,4 +193,6 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
     public void updateScore(ProjectRecordEntity vo) {
         this.baseMapper.updateScore(vo);
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml
index d3a2851..dca4504 100644
--- a/src/main/resources/mapper/tms/ProjectRecordDao.xml
+++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml
@@ -212,4 +212,54 @@
         SET score = #{score}
         WHERE recordId = #{recordid}
     </update>
+
+
+    <!--练习记录-->
+    <select id="sumByPracticeNum" 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
+        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 projectPermissions = 0
+        GROUP BY c.recordId DESC;
+    </select>
+
+    <!--  考核记录  -->
+    <select id="sumByAssessmentNum" 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
+        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
+        WHERE tpr.userId = #{userId}
+          AND tpr.isdel >= 0
+          AND tp.projectPermissions != 0
+	AND ter.eventId = tpr.recordId
+        ORDER BY
+            tpr.recordId DESC;
+
+    </select>
 </mapper>
\ No newline at end of file