From 0a5fbd57f81eef9169fa94afac9092c9e7dd1311 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 29 十二月 2021 17:56:51 +0800
Subject: [PATCH] 大屏分类修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 c8aa139..3886633 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
@@ -200,13 +200,34 @@
//居民活动柱状统计
List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, true);
+ //居民活动新增数据
+ List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, true);
+ for (int i = 1; i <= currentMon; i++) {
+ String temp;
+ if (i > 9) {
+ temp = "" + i;
+ } else {
+ temp = "0" + i;
+ }
+ boolean isExist = actAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
+ e.getFiled().endsWith(temp));
+ if (!isExist) {
+ StatisticsCommVO other = new StatisticsCommVO();
+ other.setFiled(temp);
+ other.setNum(0);
+ actAddPolylineData.add(other);
+ }
+ }
+ actAddPolylineData = actAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
+ .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
//居民活动发布总数
int residentActTotalCount = 0;
if (!residentActHistogram.isEmpty()) {
residentActTotalCount = residentActHistogram.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum();
}
statisticsVO.setResidentActTotalCount(residentActTotalCount);
- statisticsVO.setResidentActHistogram(residentActHistogram);
+// statisticsVO.setResidentActHistogram(residentActHistogram);
+ statisticsVO.setResidentActHistogram(actAddPolylineData);
//业主委员会党员占比
List<StatisticsCommVO> committeePartyPercent = comActCommitteeDao.selectCommitteePartyPercent(communityId);
statisticsVO.setCommitteePartyPercent(committeePartyPercent);
--
Gitblit v1.7.1