diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java index caca2658..7a78e8be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java @@ -72,11 +72,10 @@ public class CasesRecommendApi extends ApiBaseController { PageList page = iCasesRecommendService.page(casesRecommendVo.getPageIndex(), casesRecommendVo.getPageSize(), casesRecommendVo); // 组装查看率 page.getList().forEach(it -> { - List recordList = iCasesRecommendPushRecordService.findAllByRecommendId(it.getId()); + List recordList = iCasesRecommendPushRecordService.findReadByRecommendId(it.getId()); if (CollectionUtil.isNotEmpty(recordList)) { // 查看率:查看率=案例查看人数(各案例查看人数之合)/(当条推荐记录包含的案例 × 用户数) - long viewCount = recordList.stream().filter(record -> record.getReadFlag().equals(1)).count(); - it.setViewRate(String.valueOf(viewCount * 100 / recordList.size()).concat("%")); + it.setViewRate(String.valueOf(recordList.size() * 100 / recordList.size()).concat("%")); } }); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java index f462bfc0..30fe719b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java @@ -26,6 +26,9 @@ public interface ICasesRecommendPushRecordService { */ List findAllByRecommendId(String recommendId); + + List findReadByRecommendId(String recommendId); + /** * 重新推送或撤回 * diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index b37b4a98..5eeeaa6e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -159,6 +159,11 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR return casesRecommendPushRecordDao.findList(FieldFilters.eq("recommendId", recommendId)); } + @Override + public List findReadByRecommendId(String recommendId) { + return casesRecommendPushRecordDao.findList(FieldFilters.eq("recommendId", recommendId), FieldFilters.eq("readFlag", 1)); + } + @Override public void rePushOrWithdraw(boolean isWithdraw, CasesRecommend casesRecommend) { if (ObjectUtil.isEmpty(casesRecommend)) {