From c55137bdc0f01ac04d490f860afd991bec5d29fb Mon Sep 17 00:00:00 2001
From: tuyp <tuyaping@ykhl.com>
Date: Mon, 12 Dec 2022 09:39:03 +0800
Subject: [PATCH] 导出bug修复

---
 src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java         | 8 +++++---
 src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java            | 6 +++---
 src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java | 2 +-
 src/main/resources/mapper/LiveDictMapper.xml                               | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java b/src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java
index 85900c0..accc625 100644
--- a/src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/LiveClassesServiceImpl.java
@@ -121,6 +121,7 @@ public class LiveClassesServiceImpl extends ServiceImpl<LiveClassesMapper, LiveC
         Page pager = new Page(1, -1);
         IPage iPage = this.baseMapper.classMembers(pager, classMembersDTO.getLiveId(), classMembersDTO.getClassId(), classMembersDTO.getUserName());
 
+        List<ExportClassMembersVO> exportClassMembersVOS = new ArrayList<ExportClassMembersVO>();
         List<ClassMembersVO> classMembersVOS = iPage.getRecords();
         for (ClassMembersVO classMembersVO : classMembersVOS) {
 
@@ -180,12 +181,13 @@ public class LiveClassesServiceImpl extends ServiceImpl<LiveClassesMapper, LiveC
             exportClassMembersVO.setIpAddress(changeListToString(ipAddress));
             exportClassMembersVO.setTerminals(changeListToString(terminals));
             if (liveStudyHistoryDOS.size() > 0) {
-                classMembersVO.setSignInCounts(1);
+                exportClassMembersVO.setSignInCounts(1);
             } else {
-                classMembersVO.setSignInCounts(0);
+                exportClassMembersVO.setSignInCounts(0);
             }
+            exportClassMembersVOS.add(exportClassMembersVO);
         }
-        return iPage.getRecords();
+        return exportClassMembersVOS;
     }
 
     public DataViewVO dataView(DataViewDTO dataViewDTO) {
diff --git a/src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java
index 970b545..9a0a4e5 100644
--- a/src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/LiveDictServiceImpl.java
@@ -122,7 +122,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
 
         if (null != ids) {
 
-            //找到该测评已有的学生
+            //
             List<Long> oldIds = this.baseMapper.liveClassesIds(addLiveDTO.getId());
             List<Long> newIds = addLiveDTO.getIds();
 
@@ -131,7 +131,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
                 newStudentIds2.add(lg);
             }
 
-            newIds.removeAll(oldIds); //新增的人在newStudentIds里
+            newIds.removeAll(oldIds); //
             if (newIds.size() > 0) {
                 for (Long lg : newIds) {
                     LiveClassesDO liveClassesDO = new LiveClassesDO();
@@ -141,7 +141,7 @@ public class LiveDictServiceImpl extends ServiceImpl<LiveDictMapper, LiveDictDO>
                 }
             }
 
-            oldIds.removeAll(newStudentIds2); //以前的人要删掉的
+            oldIds.removeAll(newStudentIds2); //
             if (oldIds.size() > 0) {
                 liveClassesMapper.delete(new QueryWrapper<LiveClassesDO>()
                         .lambda()
diff --git a/src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java b/src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java
index ca39689..c4eefeb 100644
--- a/src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/LivePlaybackHistoryServiceImpl.java
@@ -134,7 +134,7 @@ public class LivePlaybackHistoryServiceImpl extends ServiceImpl<LivePlaybackHist
             exportPlaybacksVO.setStartTimes(changeListToString(startTimes));
             exportPlaybacksVOS.add(exportPlaybacksVO);
         }
-        return iPage.getRecords();
+        return exportPlaybacksVOS;
     }
 
     public List<LiveVodsDO> playbacks(LiveDictDO liveDictDO) {
diff --git a/src/main/resources/mapper/LiveDictMapper.xml b/src/main/resources/mapper/LiveDictMapper.xml
index 191cbfd..197a2f8 100644
--- a/src/main/resources/mapper/LiveDictMapper.xml
+++ b/src/main/resources/mapper/LiveDictMapper.xml
@@ -67,7 +67,7 @@
         WHERE
             t.delete_date IS NULL
             AND t2.delete_date IS NULL
-            and t.id = #{liveId}
+            and t.live_id = #{liveId}
     </select>
 
     <update id="updateStatus" parameterType="long">
--
libgit2 0.25.0