feat：优化接口

fs-service-system/src/main/java/com/fs/course/vo/newfs/FsCourseAnalysisCountVO.java

@@ -3,11 +3,13 @@ package com.fs.course.vo.newfs;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
 @Data
 @ApiModel
+@Accessors(chain = true)
 public class FsCourseAnalysisCountVO implements Cloneable {
 
     @ApiModelProperty(value = "关联视频id")

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -618,14 +618,19 @@ public class FsUserServiceImpl implements IFsUserService
 
         //4、处理数据
         return videoList.stream().map(v -> {
-            FsCourseAnalysisVO fsCourseAnalysisVO = new FsCourseAnalysisVO();
-            BeanUtils.copyProperties(v, fsCourseAnalysisVO);
-            FsCourseAnalysisCountVO countVO = new FsCourseAnalysisCountVO();
-            fsCourseAnalysisVO.setCountVO(courseMap.getOrDefault(v.getVideoId(), countVO));
+            FsCourseAnalysisVO allVO = new FsCourseAnalysisVO();
+            BeanUtils.copyProperties(v, allVO);
 
-            fsCourseAnalysisVO.setCountVO(redPacketMap.getOrDefault(v.getVideoId(), countVO));
-            fsCourseAnalysisVO.setCountVO(answerMap.getOrDefault(v.getVideoId(), countVO));
-            return fsCourseAnalysisVO;
+            FsCourseAnalysisCountVO countVO = new FsCourseAnalysisCountVO();
+            FsCourseAnalysisCountVO courseVO = courseMap.getOrDefault(v.getVideoId(), countVO);
+            FsCourseAnalysisCountVO redPacketVO = redPacketMap.getOrDefault(v.getVideoId(), countVO);
+            FsCourseAnalysisCountVO answerVO = answerMap.getOrDefault(v.getVideoId(), countVO);
+
+            BeanUtils.copyProperties(courseVO, countVO);
+            countVO.setRedPacketNum(redPacketVO.getRedPacketNum()).setRedPacketAmount(redPacketVO.getRedPacketAmount());
+            countVO.setAnswerNum(answerVO.getAnswerNum()).setAnswerRightNum(answerVO.getAnswerRightNum()).setAnswerRightRate(answerVO.getAnswerRightRate());
+            allVO.setCountVO(countVO);
+            return allVO;
         }).collect(Collectors.toList());
     }
 

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -179,9 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         course.course_name
         FROM `fs_user_course_video` video
         LEFT JOIN fs_user_course course ON video.course_id = course.course_id
-        where 1 = 1
-        and course.is_del = 0
-        AND FIND_IN_SET(#{companyId}, course.company_ids)
+        where course.is_del = 0
         <if test="courseId != null and courseId !='' ">
             AND video.course_id = #{courseId}
         </if>

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -391,8 +391,8 @@
         fs_user_course_count.stop_watch_days,
         fs_user_course_count.create_time,
         fs_user_course_count.complete_watch_date,
-        company_tag.tag,
-        company_tag_user.tag_ids,
+        GROUP_CONCAT(DISTINCT company_tag.tag) AS tag,
+        GROUP_CONCAT(DISTINCT company_tag.tag_id) AS tagIds,
         company_user.nick_name as companyUserNickName
         FROM
         fs_user