Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -185,26 +185,15 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
                 BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO();
                 data.setName(issue);
                 if(null != issueYearlyDataList && !issueYearlyDataList.isEmpty()){
-                    int i = 0;
-                    monthMap.keySet().forEach(monthId->{
-                        Map<String, Integer> collect = val.stream().collect(Collectors.toMap(BranchIssueDataResultDTO::getMonthId, BranchIssueDataResultDTO::getData, (o1, o2) -> o1));
-                        numArray.add(collect.getOrDefault(monthId,NumConstant.ZERO));
-                    });
-
-                    //for (int i=0;i< monthMap.keySet().size();i++) {
-                        String monthId = monthMap.keySet().iterator().next();
-
-
-                        // 202007
-                        // 2007->list
-                       /* Optional<BranchIssueDataResultDTO> optional
+                    monthMap.keySet().forEach( monthId ->{
+                        Optional<BranchIssueDataResultDTO> optional
                                 = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny();
                         if(optional.isPresent()){
                             numArray.add(optional.get().getData());
                         }else{
                             numArray.add(NumConstant.ZERO);
-                        }*/
-                    //}
+                        }
+                    });
                 }else{
                     for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){
                         numArray.add(NumConstant.ZERO);
@@ -236,14 +225,6 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         return result;
     }
 
-    public static void main(String[] args) {
-        DateUtils dateUtils = new DateUtils();
-        Map<String,String> monthMap = dateUtils.getXpro();
-
-        System.out.println(monthMap);
-        System.out.println(monthMap.keySet().iterator().next());
-    }
-
     /**
      * @Description 4、支部建设情况|联建共建情况-排行
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982