看课流量统计改成按时间范围

fs-service-system/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -263,13 +263,20 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
     @Override
     public TableDataInfo selectQwWatchLogAllStatisticsListVONew(QwWatchLogStatisticsListParam param) {
         // 获取当前公司下的所有销售
-        List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+        List<Long> userIds;
+        if(param.getCompanyUserId()  == null){
+            List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
 
-        List<QwWatchLogAllStatisticsListVO> list = new ArrayList<>();
+            userIds = companyUsers.stream()
+                    .map(CompanyUser::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        } else {
+            userIds = new ArrayList<>();
+            userIds.add(param.getCompanyUserId());
+        }
 
-        List<Long> userIds = companyUsers.stream().filter(e -> e.getUserId() != null)
-                .map(e -> e.getUserId())
-                .collect(Collectors.toList());
+        List<QwWatchLogAllStatisticsListVO> list = new ArrayList<>();
 
         List<QwWatchLogAllStatisticsListVO> vos = qwWatchLogMapper
                 .selectQwWatchLogAllStatisticsListVONew(userIds, param.getSTime(), param.getETime(),

fs-service-system/src/main/resources/mapper/qw/QwWatchLogMapper.xml

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COUNT(1) AS line,project,course_id,video_id
              from qw_watch_log
             <where>
-                 <if test="companyUserId">
+                 <if test="companyUserIds != null">
                      and company_user_id in
                      <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
                          ${item}