From 773a2d136b903a127c3f28aa4d806d1b7bb1410a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 14:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/act/service/impl/GroupActInfoServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 9a44da87ea..8fedb2b70b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -910,7 +910,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             }
         }
         // 折线图组装
-        List<OrganizationalLifeLineChartDTO> lineChart = lineChart();
+        List<OrganizationalLifeLineChartDTO> lineChart = lineChart(formDTO.getYearId());
         if (!CollectionUtils.isEmpty(chartResult)){
             Map<String, List<OrganizationalLifeLineChartDTO>> groupByMonth = chartResult.stream().collect(Collectors.groupingBy(OrganizationalLifeLineChartDTO::getMonth));
             groupByMonth.forEach((month,list) -> {
@@ -933,8 +933,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
      * @author zxc
      * @date 2021/9/6 10:55 上午
      */
-    public List<OrganizationalLifeLineChartDTO> lineChart(){
-        String year = String.valueOf(LocalDate.now().getYear());
+    public List<OrganizationalLifeLineChartDTO> lineChart(String yearId){
+        String year = yearId.substring(NumConstant.ZERO,NumConstant.FOUR);
         List<OrganizationalLifeLineChartDTO> lineChart = new ArrayList<>();
         for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) {
             OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();