|
@@ -681,12 +681,18 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
|
|
|
Map<String, List<UserStudyRecord>> collect = recordList.stream().filter(x -> ObjectUtils.isNotNull(x.getFromPlat())).collect(Collectors.groupingBy(UserStudyRecord::getFromPlat));
|
|
|
if (CollectionUtils.isNotEmpty(collect)) {
|
|
|
collect.forEach((k, v) -> {
|
|
|
- if (k.equals("1")) {
|
|
|
- //小程序
|
|
|
- item.setAppWatchNumber(collect.keySet().size());
|
|
|
- } else {
|
|
|
- //PC
|
|
|
- item.setAdminWatchNumber(collect.keySet().size());
|
|
|
+ switch (k){
|
|
|
+ case "1"://小程序
|
|
|
+ Map<Long, List<UserStudyRecord>> rListMap = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
|
|
|
+ item.setAppWatchNumber(rListMap.keySet().size());
|
|
|
+ break;
|
|
|
+ case "2"://PC
|
|
|
+// collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId))
|
|
|
+ Map<Long, List<UserStudyRecord>> records = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
|
|
|
+ item.setAdminWatchNumber(records.keySet().size());
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
}
|
|
|
});
|
|
|
}
|