营期统计优化2

fs-service/src/main/java/com/fs/course/param/CourseAnalysisNoPageParam.java

@@ -0,0 +1,34 @@
+package com.fs.course.param;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 课程分析查询-入参
+ */
+@Data
+public class CourseAnalysisNoPageParam implements Serializable {
+    @ApiModelProperty(value = "销售用户id")
+    private Long companyUserId;
+
+    @ApiModelProperty(value = "营期id")
+    private Long periodId;
+
+    @ApiModelProperty(value = "视频id")
+    private Long videoId;
+
+//    @ApiModelProperty(value = "登录用户id，不传")
+//    private Long userId;
+
+    @ApiModelProperty(value = "公司id，不传")
+    private Long companyId;
+
+    @ApiModelProperty(value = "视频id-管理端传参")
+    private List<Long> videoIdList;
+
+}
+

fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -17,6 +17,7 @@ import com.fs.course.mapper.FsUserCoursePeriodDaysMapper;
 import com.fs.course.mapper.FsUserCoursePeriodMapper;
 import com.fs.course.mapper.FsUserCourseVideoRedPackageMapper;
 import com.fs.course.param.CompanyRedPacketParam;
+import com.fs.course.param.CourseAnalysisNoPageParam;
 import com.fs.course.param.CourseAnalysisParam;
 import com.fs.course.param.PeriodCountParam;
 import com.fs.course.service.IFsUserCoursePeriodDaysService;
@@ -245,15 +246,13 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         List<FsUserCoursePeriodDays> videoList = baseMapper.selectFsUserCoursePeriodDaysList(fsUserCoursePeriodDays);
 
         //2、查询统计
-        CourseAnalysisParam courseAnalysisParam = new CourseAnalysisParam();
-        courseAnalysisParam.setPageNum(param.getPageNum());
-        courseAnalysisParam.setPageSize(param.getPageSize());
-        courseAnalysisParam.setPeriodId(param.getPeriodId());
-        courseAnalysisParam.setVideoIdList(param.getVideoIdList());
-        courseAnalysisParam.setCompanyId(param.getCompanyId());
-        List<FsCourseAnalysisCountVO> courseCountList = fsUserMapper.courseAnalysisWatchLog(courseAnalysisParam);
-        List<FsCourseAnalysisCountVO> redPacketCountList = fsUserMapper.courseAnalysisRedPacketCount(courseAnalysisParam);
-        List<FsCourseAnalysisCountVO> answerCountList = fsUserMapper.courseAnalysisAnswerCount(courseAnalysisParam);
+        CourseAnalysisNoPageParam courseAnalysisNoPageParam = new CourseAnalysisNoPageParam();
+        courseAnalysisNoPageParam.setPeriodId(param.getPeriodId());
+        courseAnalysisNoPageParam.setVideoIdList(param.getVideoIdList());
+        courseAnalysisNoPageParam.setCompanyId(param.getCompanyId());
+        List<FsCourseAnalysisCountVO> courseCountList = fsUserMapper.courseAnalysisWatchLog(courseAnalysisNoPageParam);
+        List<FsCourseAnalysisCountVO> redPacketCountList = fsUserMapper.courseAnalysisRedPacketCount(courseAnalysisNoPageParam);
+        List<FsCourseAnalysisCountVO> answerCountList = fsUserMapper.courseAnalysisAnswerCount(courseAnalysisNoPageParam);
 
         //3、转化为map
         Map<Long, FsCourseAnalysisCountVO> courseMap = courseCountList.stream()

fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.fs.course.domain.FsUserWatchCourseStatistics;
 import com.fs.course.domain.FsUserWatchStatistics;
+import com.fs.course.param.CourseAnalysisNoPageParam;
 import com.fs.course.param.CourseAnalysisParam;
 import com.fs.course.vo.newfs.FsCourseAnalysisCountVO;
 import com.fs.his.domain.FsUser;
@@ -257,9 +258,9 @@ public interface FsUserMapper
     FsUser selectFsUserByMpOpenId(@Param("phone") String phone);
 
 
-    List<FsCourseAnalysisCountVO> courseAnalysisWatchLog(CourseAnalysisParam param);
-    List<FsCourseAnalysisCountVO> courseAnalysisRedPacketCount(CourseAnalysisParam param);
-    List<FsCourseAnalysisCountVO> courseAnalysisAnswerCount(CourseAnalysisParam param);
+    List<FsCourseAnalysisCountVO> courseAnalysisWatchLog(CourseAnalysisNoPageParam param);
+    List<FsCourseAnalysisCountVO> courseAnalysisRedPacketCount(CourseAnalysisNoPageParam param);
+    List<FsCourseAnalysisCountVO> courseAnalysisAnswerCount(CourseAnalysisNoPageParam param);
 
     FsUser selectFsUserById(@Param("userId") Long userId);
 

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -36,6 +36,7 @@ import com.fs.company.mapper.*;
 import com.fs.company.service.ICompanyTagService;
 import com.fs.course.domain.FsUserCompanyUser;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
+import com.fs.course.param.CourseAnalysisNoPageParam;
 import com.fs.course.param.CourseAnalysisParam;
 import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
 import com.fs.course.param.newfs.UserCourseVideoPageParam;
@@ -986,8 +987,10 @@ public class FsUserServiceImpl implements IFsUserService {
         //2、查询统计
         List<FsCourseAnalysisCountVO> courseCountList = fsUserMapper.courseAnalysisCourseCount(param);
 
-        List<FsCourseAnalysisCountVO> redPacketCountList = fsUserMapper.courseAnalysisRedPacketCount(param);
-        List<FsCourseAnalysisCountVO> answerCountList = fsUserMapper.courseAnalysisAnswerCount(param);
+        CourseAnalysisNoPageParam paramNoPage = new CourseAnalysisNoPageParam();
+        BeanUtils.copyProperties(paramNoPage, userCourseVideoPageParam);
+        List<FsCourseAnalysisCountVO> redPacketCountList = fsUserMapper.courseAnalysisRedPacketCount(paramNoPage);
+        List<FsCourseAnalysisCountVO> answerCountList = fsUserMapper.courseAnalysisAnswerCount(paramNoPage);
 
         //3、转化为map
         Map<Long, FsCourseAnalysisCountVO> courseMap = courseCountList.stream()