日期

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(){
+    public List<OrganizationalLifeLineChartDTO> lineChart(String yearId){
-        String year = String.valueOf(LocalDate.now().getYear());
+        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();