Merge branch 'dev_guidance' into develop

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -943,17 +943,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);
         }