From 55a3cf5b1e25d3776054f4295b696a1a988bd9bf Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 14:47:12 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BAb?= =?UTF-8?q?ug=E4=BF=AE=E6=94=B9=20=E6=B5=8B=E8=AF=95=E4=B8=8B=20=E7=9C=8B?= =?UTF-8?q?=E7=9C=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d2ce490f --- .../impl/GrassrootsPartyDevServiceImpl.java | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 1fc834ae1f..3173e1269e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/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 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 optional + monthMap.keySet().forEach( monthId ->{ + Optional 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 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