From 793895f397672a2df2bc969a35b8328866ceeb9e Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Mon, 1 Mar 2021 17:19:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/tms/AchievementManagementDao.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 8b21be1..098e3c2 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -359,7 +359,7 @@
 
     <select id="list" resultType="com.msdw.tms.entity.ResultsEntity">
         SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM
-        hr_experimental_report her where hpm.projectId = her.projectId ) as number
+        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 =
@@ -380,7 +380,7 @@
         SELECT et.id,et.experimental_class_name as experimentalClassName,et.experimental_name as
         experimentalName,et.project_id as projectId,
         pm.projectName,pm.projectPermissions,et.creation_time as creationTime,(SELECT count(*) FROM
-        hr_experimental_report her where et.project_id = her.projectId ) as number
+        tms_project_record her where et.project_id = her.projectId ) as number
         FROM tms_experimental_teaching et,hr_project_management pm
         WHERE user_id = #{userId}
         AND et.project_id = pm.projectId

From f451c7724a7c96701d6eaeb3068fc38d2bc8a95a Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Tue, 2 Mar 2021 14:28:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=AB=AF=E5=AE=9E=E9=AA=8C=E4=BA=BA=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/msdw/tms/dao/ClassTeachingDao.java    |  3 ++
 .../impl/ClassTeachingServiceImpl.java        | 29 +++++++++++++++++--
 .../impl/ExperimentalTeachingServiceImpl.java | 10 +++++++
 .../resources/mapper/tms/ClassTeachingDao.xml | 10 ++++++-
 .../mapper/tms/ExperimentalTeachingDao.xml    |  3 +-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java
index d0c1029..5cbc435 100644
--- a/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java
+++ b/src/main/java/com/msdw/tms/dao/ClassTeachingDao.java
@@ -23,4 +23,7 @@ public interface ClassTeachingDao {
     void updateSurplusTimeLe(ProjectRecordVo recordVo);
 
     void updateSurplusTimeGt(ProjectRecordVo recordVo);
+
+
+    int updateExperimentalNumber(Integer number, Integer id);
 }
diff --git a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java
index db7039c..fbf1d69 100644
--- a/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ClassTeachingServiceImpl.java
@@ -2,24 +2,32 @@ package com.msdw.tms.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.msdw.tms.common.utils.Constant;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.dao.ClassTeachingDao;
+import com.msdw.tms.dao.ExperimentalTeachingDao;
 import com.msdw.tms.entity.BroadcastEntity;
 import com.msdw.tms.entity.ExperimentalTeachingEntity;
 import com.msdw.tms.entity.ProjectRecordEntity;
+import com.msdw.tms.entity.vo.ExperimentalTeachingVO;
 import com.msdw.tms.entity.vo.ProjectRecordVo;
 import com.msdw.tms.service.ClassTeachingService;
 import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
-public class ClassTeachingServiceImpl implements ClassTeachingService {
+public class ClassTeachingServiceImpl extends ServiceImpl<ExperimentalTeachingDao, ExperimentalTeachingEntity> implements ClassTeachingService {
 
     @Autowired
     private ClassTeachingDao classMapper;
+
+    @Autowired
+    private ClassTeachingDao classTeachingDao;
+
     @Override
     public ExperimentalTeachingEntity queryInvitationcode(ExperimentalTeachingEntity experimentEntity) {
         ExperimentalTeachingEntity ex = classMapper.queryInvitationCode(experimentEntity);
@@ -44,8 +52,23 @@ public class ClassTeachingServiceImpl implements ClassTeachingService {
         this.classMapper.updateSurplusTimeUp(recordVo);//倒计时：设定距离实验开始的剩余时间
         this.classMapper.updateSurplusTimeLe(recordVo);
         this.classMapper.updateSurplusTimeGt(recordVo);
-        IPage<ProjectRecordVo> schoolRecord = this.classMapper.getByClassRecord(page1, recordVo);
-        PageUtils pageUtils = new PageUtils(schoolRecord);
+//        IPage<ProjectRecordVo> schoolRecord = this.classMapper.getByClassRecord(page1, recordVo);
+//        PageUtils pageUtils = new PageUtils(schoolRecord);
+        ExperimentalTeachingVO vo =  new ExperimentalTeachingVO();
+        BeanUtils.copyProperties(recordVo,vo);
+        ExperimentalTeachingDao userDao = this.getBaseMapper();
+        IPage<ExperimentalTeachingEntity> list = userDao.queryExperimentalTeaching(page1, vo);
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            Integer number = list.getRecords().get(i).getExperimentalNumber();
+            Integer id = list.getRecords().get(i).getId();
+            //读取另一个表，将数据更新进 tms_experimental_teaching
+            int isTure = classTeachingDao.updateExperimentalNumber(number,id);
+            if(isTure < 0){
+                return null;
+            }
+        }
+
+        PageUtils pageUtils = new PageUtils(list);
         return pageUtils;
     }
 
diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
index 1265737..0e6843f 100644
--- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java
@@ -36,6 +36,16 @@ public class ExperimentalTeachingServiceImpl extends ServiceImpl<ExperimentalTea
         Page<T> page1 = new Page<>(page, size);
         ExperimentalTeachingDao userDao = this.getBaseMapper();
         IPage<ExperimentalTeachingEntity> list = userDao.queryExperimentalTeaching(page1, vo);
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            Integer number = list.getRecords().get(i).getExperimentalNumber();
+            Integer id = list.getRecords().get(i).getId();
+            //读取另一个表，将数据更新进 tms_experimental_teaching
+            int isTure = classTeachingDao.updateExperimentalNumber(number,id);
+            if(isTure < 0){
+                return null;
+            }
+        }
+
         PageUtils pageUtils = new PageUtils(list);
         return pageUtils;
     }
diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml
index 17756c1..3265d03 100644
--- a/src/main/resources/mapper/tms/ClassTeachingDao.xml
+++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml
@@ -13,7 +13,8 @@
         surplus_time,
         experiment_duration,
         experimental_name,
-        experimental_number,
+        (select count(*)
+        from tms_project_record WHERE projectId = project_id) as experimental_number,
         start_time,
         stop_time,
         `status`,
@@ -109,4 +110,11 @@
     <select id="querySimulationPlayList" resultType="com.msdw.tms.entity.BroadcastEntity">
         SELECT id,title,links,isdel FROM tms_broadcast
     </select>
+
+    <update id="updateExperimentalNumber">
+    UPDATE tms_experimental_teaching
+    SET experimental_number = #{number}
+    WHERE
+        id = #{id}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
index 3891647..05c0745 100644
--- a/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
+++ b/src/main/resources/mapper/tms/ExperimentalTeachingDao.xml
@@ -10,7 +10,8 @@
             experimental_name,
             project_id,
             project_name,
-            experimental_number,
+            (select count(*)
+            from tms_project_record WHERE projectId = project_id) as experimental_number,
             experiment_duration,
             type,
             start_time,

From b868abe4c98c84c75b6ae502bded5deedc65c832 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Tue, 2 Mar 2021 17:52:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=88=86=E9=92=9F?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/msdw/tms/service/impl/ProjectRecordServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 22da5fb..211960c 100644
--- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java
@@ -75,11 +75,11 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         ProjectRecordVo projectRecordVo = this.baseMapper.getByUserScore(userId, isdel);
         Double totalTime = projectRecordVo.getTotalTime();
         if (totalTime != null) {
-            /*DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormat df = new DecimalFormat("0.0");
             double time = totalTime / 60;
             String format = df.format(time);
-            projectRecordVo.setTotalTime(Double.parseDouble(format));*/
-            projectRecordVo.setTotalTime(projectRecordVo.getTotalTime());
+            projectRecordVo.setTotalTime(Double.parseDouble(format));
+            //projectRecordVo.setTotalTime(projectRecordVo.getTotalTime());
         }