From aeb159d07fa6d411bc8727e117f651b568cceab7 Mon Sep 17 00:00:00 2001
From: tuyp <tuyaping@ykhl.com>
Date: Thu, 10 Mar 2022 18:17:20 +0800
Subject: [PATCH] 2022.03.10 疫情备份

---
 src/main/java/com/subsidy/controller/AdministerController.java        |  2 +-
 src/main/java/com/subsidy/controller/ClassDictController.java         |  1 -
 src/main/java/com/subsidy/controller/CompanyDictController.java       |  2 +-
 src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java | 13 ++++---------
 src/main/resources/mapper/VodPlayHistoryMapper.xml                    |  6 +++---
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/subsidy/controller/AdministerController.java b/src/main/java/com/subsidy/controller/AdministerController.java
index 37d0b3d..91f9dfe 100644
--- a/src/main/java/com/subsidy/controller/AdministerController.java
+++ b/src/main/java/com/subsidy/controller/AdministerController.java
@@ -88,7 +88,7 @@ public class AdministerController {
 
     @PostMapping("classSummary")
     @ApiOperation("班级详情--数据概览  id 班级id  ")
-    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+//    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO classSummary(@RequestBody ClassDetailDTO classDetailDTO){
         return ResponseData.generateCreatedResponse(0,administerService.classSummary(classDetailDTO));
     }
diff --git a/src/main/java/com/subsidy/controller/ClassDictController.java b/src/main/java/com/subsidy/controller/ClassDictController.java
index a1c447b..e0e2ae7 100644
--- a/src/main/java/com/subsidy/controller/ClassDictController.java
+++ b/src/main/java/com/subsidy/controller/ClassDictController.java
@@ -80,7 +80,6 @@ public class ClassDictController {
 
     @PostMapping("getSpareMembers")
     @ApiOperation("获取不在某班级的某企业里所有成员   companyId 企业id  classId 班级id")
-    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO getSpareMembers(@RequestBody GetSpareMembersDTO getSpareMembersDTO){
         return ResponseData.generateCreatedResponse(0,classDictService.getSpareMembers(getSpareMembersDTO));
     }
diff --git a/src/main/java/com/subsidy/controller/CompanyDictController.java b/src/main/java/com/subsidy/controller/CompanyDictController.java
index 8eef2ae..b20a1d3 100644
--- a/src/main/java/com/subsidy/controller/CompanyDictController.java
+++ b/src/main/java/com/subsidy/controller/CompanyDictController.java
@@ -35,7 +35,7 @@ public class CompanyDictController {
 
     @PostMapping("/administers")
     @ApiOperation("查询所有企业  {id companyName fieldId 行业id pageNum  pageSize }")
-    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
+//    @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
     public ResponseVO operators(@RequestBody OperatorsDTO operatorsDTO){
         return ResponseData.generateCreatedResponse(0,companyDictService.operators(operatorsDTO));
     }
diff --git a/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java b/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
index 8fcb78a..6902c39 100644
--- a/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
@@ -455,11 +455,6 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
         //查找课程里的所有视频
         List<VodDictDO> vodDictDOS = courseContentMapper.getCourseVods(classDictDO.getCourseId());
 
-        int vodTotalLength = 0;
-        for (VodDictDO vodDictDO : vodDictDOS) {
-            vodTotalLength += vodDictDO.getVodLength();
-        }
-
         //查看每个人看视频的时长
         for (ClassMemberMappingDO classMemberMappingDO : classMemberMappingDOS) {
 
@@ -518,13 +513,13 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
 
                 //今天应该看多久视频
                 int totalPlayLength = 0;
-                if (signInRecordDOS.size() == 3) {
+                if (localDateTimes.size() == 3) {
                     totalPlayLength = _3times();
-                } else if (signInRecordDOS.size() == 4) {
+                } else if (localDateTimes.size() == 4) {
                     totalPlayLength = _4times();
-                } else if (signInRecordDOS.size() == 5) {
+                } else if (localDateTimes.size() == 5) {
                     totalPlayLength = _5times();
-                } else if (signInRecordDOS.size() == 6) {
+                } else if (localDateTimes.size() == 6) {
                     totalPlayLength = _6times();
                 } else {
                     totalPlayLength = _7times();
diff --git a/src/main/resources/mapper/VodPlayHistoryMapper.xml b/src/main/resources/mapper/VodPlayHistoryMapper.xml
index e1b16aa..39b8003 100644
--- a/src/main/resources/mapper/VodPlayHistoryMapper.xml
+++ b/src/main/resources/mapper/VodPlayHistoryMapper.xml
@@ -22,9 +22,9 @@
         delete_date,
         id, class_id, vod_id, member_id, play_length, play_record
     </sql>
-    <delete id="deleteById">
-        delete from vod_play_history
-    </delete>
+<!--    <delete id="deleteById">-->
+<!--        delete from vod_play_history-->
+<!--    </delete>-->
 
     <select id="studyHistory" parameterType="long" resultType="com.subsidy.vo.vod.StudyHistoryVO">
        SELECT
--
libgit2 0.25.0