From 71179f6cb7bcc942c92396be5358da80dfda6024 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 14:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
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, 4 insertions(+), 2 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 41e77cee6a..9a44da87ea 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
@@ -929,17 +929,19 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
 
     /**
      * @Description  折线图构造
+     * 应前端要求，日期格式由 01月，02月 改为 2021-01，2021-02
      * @author zxc
      * @date 2021/9/6 10:55 上午
      */
     public List<OrganizationalLifeLineChartDTO> lineChart(){
+        String year = String.valueOf(LocalDate.now().getYear());
         List<OrganizationalLifeLineChartDTO> lineChart = new ArrayList<>();
         for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) {
             OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();
             if (i < NumConstant.TEN){
-                dto.setMonth(NumConstant.ZERO + String.valueOf(i) + "月");
+                dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i));
             }else {
-                dto.setMonth(String.valueOf(i) + "月");
+                dto.setMonth(year +"-"+ String.valueOf(i) + "月");
             }
             lineChart.add(dto);
         }