From f372e6282a957dbbc529c432f3e19a4028d7aee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 04 一月 2022 14:15:38 +0800
Subject: [PATCH] 1.4 折线图时间处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 6c37a89..374dc00 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -293,7 +293,7 @@
bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
- BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX(), bigScreenStaticsReserveMonth.getYear());
bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
@@ -334,6 +334,7 @@
aDate=i+"";
}
BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
+ bigScreenStaticsReserveMonth.setYear("2021");
bigScreenStaticsReserveMonth.setX(aDate);
bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
@@ -352,6 +353,7 @@
}
BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonth.setYear(nowYear);
bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
}
--
Gitblit v1.7.1