From ca4034c3a285f2c22fa19e5eaa88d505b5588c0b Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 29 十二月 2021 10:48:40 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index fca296c..c8aa139 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -135,7 +135,7 @@
List<StatisticsCommVO> microWishRealizePercent = comActMicroWishDAO.selectRealizePercent(communityId);
statisticsVO.setMicroWishRealizePercent(microWishRealizePercent);
//微心愿图片
- List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, pageSize);
+ List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, 20);
statisticsVO.setMicroWishImages(microWishImages);
//议事投票类型占比
@@ -149,7 +149,7 @@
statisticsVO.setVoteTitles(voteTitles);
//邻里圈图片
- List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, pageSize);
+ List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, 20);
statisticsVO.setNeighborImages(neighborImages);
//邻里圈文本内容
List<String> neighborContents = comActNeighborCircleDAO.getContents(communityId, pageSize);
@@ -195,7 +195,7 @@
List<String> warehouseLoveTransfer = comActWarehouseDonatesDao.getWarehouseLoveTransfer(communityId, pageSize);
statisticsVO.setWarehouseLoveTransfer(warehouseLoveTransfer);
//捐赠图片
- List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, pageSize);
+ List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, 20);
statisticsVO.setWarehouseImages(warehouseImages);
//居民活动柱状统计
@@ -539,7 +539,7 @@
statisticsInfo.setNeighborCircleData(neighborCircleData);
if (!neighborCircleData.isEmpty()) {
statisticsInfo.setPublishContentNum(neighborCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
- statisticsInfo.setPublishTopicNum(neighborCircleData.size());
+ statisticsInfo.setPublishTopicNum(neighborCircleData.stream().filter(e -> !"无话题".equals(e.getFiled())).collect(Collectors.toList()).size());
}
//邻里圈新增折线数据
Date nowDate = new Date();
--
Gitblit v1.7.1