From 9725e0f989b64bd669ffcfdeefb31dedd277a332 Mon Sep 17 00:00:00 2001
From: typ <tuyaping@ykhl.com>
Date: Tue, 18 Jan 2022 17:08:14 +0800
Subject: [PATCH] 视频纬度报表

---
 src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java | 16 ++++++----------
 src/main/resources/mapper/VodDictMapper.xml                       |  3 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
index 3017d27..0e8ef2a 100644
--- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
@@ -89,13 +89,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -878,7 +872,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
         List<VodDictDO> vodDictDOS = vodDictMapper.getCourseVods(classDictDO.getCourseId(), null);
 
         for (ClassDailyInfoVO classDailyInfoVO : classDailyInfoVOS) {
-            //查看这个人某个视频的长度
+            //查看某个视频的完成情况
             int total = 0;
             List<ClassVodDailyInfoItemVO> classVodDailyInfoItemVOS = new ArrayList<>();
             for (VodDictDO vodDictDO : vodDictDOS) {
@@ -886,9 +880,11 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
                 ClassVodDailyInfoItemVO classVodDailyInfoItemVO = new ClassVodDailyInfoItemVO();
                 classVodDailyInfoItemVO.setPlayLength(playLength);
                 classVodDailyInfoItemVOS.add(classVodDailyInfoItemVO);
-                total += playLength;
+                if (playLength>vodDictDO.getVodLength()){
+                    total ++;
+                }
             }
-            classDailyInfoVO.setTotal(total);
+            classDailyInfoVO.setTotal(MathUtil.intDivFloorPercent(total,vodDictDOS.size()));
             classDailyInfoVO.setClassVodDailyInfoItemVOS(classVodDailyInfoItemVOS);
         }
         return classDailyInfoVOIPage;
diff --git a/src/main/resources/mapper/VodDictMapper.xml b/src/main/resources/mapper/VodDictMapper.xml
index 859fcd4..be2ca52 100644
--- a/src/main/resources/mapper/VodDictMapper.xml
+++ b/src/main/resources/mapper/VodDictMapper.xml
@@ -52,7 +52,8 @@
     <select id="getCourseVods" parameterType="long" resultType="com.subsidy.model.VodDictDO">
         SELECT
             t2.id,
-            t2.vod_name
+            t2.vod_name,
+            t2.vod_length
         FROM
             course_content t
             LEFT JOIN vod_dict t2 ON t.id = t2.content_id
--
libgit2 0.25.0