update:首页统计

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -1124,12 +1124,21 @@ public class StatisticsServiceImpl implements IStatisticsService {
         } else {
             return new ArrayList<>();
         }
+        if(param.getType() == 5){
+            Map<String, Object> params = new HashMap<>();
+            params.put("startTime", param.getStartTime());
+            params.put("endTime", param.getEndTime());
+            params.put("companyId", param.getCompanyId());
+            params.put("sendType", sendType);
+            watchCourseStatisticsDTOS=fsCourseWatchLogMapper.watchCourseStatisticsGroupByCompany(params);
+        } else {
+            watchCourseStatisticsDTOS = watchCourseStatisticsDTOS.stream()
+                    .filter(dto -> StringUtils.equals(sendType, dto.getSendType()))
+                    .filter(dto -> param.getCompanyId() == null ||
+                            StringUtils.equals(dto.getCompanyId(), String.valueOf(param.getCompanyId())))
+                    .collect(Collectors.toList());
+        }
 
-        watchCourseStatisticsDTOS = watchCourseStatisticsDTOS.stream()
-                .filter(dto -> StringUtils.equals(sendType, dto.getSendType()))
-                .filter(dto -> param.getCompanyId() == null ||
-                        StringUtils.equals(dto.getCompanyId(), String.valueOf(param.getCompanyId())))
-                .collect(Collectors.toList());
 
 
         return watchCourseStatisticsDTOS;

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -1022,6 +1022,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             o.create_time >= #{params.startTime}
             AND o.create_time <= #{params.endTime}
+            <if test="params.companyId != null and params.companyId != ''">
+                AND o.company_id = #{params.companyId}
+            </if>
+            <if test="params.sendType != null and params.sendType != ''">
+                AND o.send_type = #{params.sendType}
+            </if>
         GROUP BY
             o.company_id,
             o.send_type