代码微调

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

@@ -267,7 +267,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         Map<String,String> Xaxis = dateUtils.getXpro();
         List<UserJoinMonthlyResultDTO> monthlyData = screenUserJoinDao.selectUserJoinDataMonthly(param.getAgencyId(),Xaxis.keySet().iterator().next());
         PublicPartiChartResultDTO result = new PublicPartiChartResultDTO();
-        result.setXAxis(Xaxis.values().stream().collect(Collectors.toList()));
+        result.setXAxis(new ArrayList<>(Xaxis.values()));
         List<Integer> defaultData = new LinkedList<>();
         for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){
             defaultData.add(NumConstant.ZERO);
@@ -282,17 +282,17 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         result.setJoinUserNumList(new ArrayList<>());
         result.setAverageJoinNumList(new ArrayList<>());
         Map<String,List<UserJoinMonthlyResultDTO>> dataMap = monthlyData.stream().collect(Collectors.groupingBy(UserJoinMonthlyResultDTO :: getMonthId));
-        Xaxis.keySet().stream().forEach(monthId -> {
+        Xaxis.keySet().forEach(monthId -> {
             List<UserJoinMonthlyResultDTO> data = dataMap.get(monthId);
-            if(null == data || data.isEmpty()){
+            if (null == data || data.isEmpty()) {
                 result.getOrganizeNumList().add(NumConstant.ZERO);
                 result.getJoinUserNumList().add(NumConstant.ZERO);
                 result.getAverageJoinNumList().add(NumConstant.ZERO);
-            }else{
+            } else {
                 Integer o = NumConstant.ZERO;
                 Integer j = NumConstant.ZERO;
                 Integer a = NumConstant.ZERO;
-                for(UserJoinMonthlyResultDTO unit : data){
+                for (UserJoinMonthlyResultDTO unit : data) {
                     o = null == unit.getOrganizeNum() ? NumConstant.ZERO : o + unit.getOrganizeNum();
                     j = null == unit.getJoinUserNum() ? NumConstant.ZERO : o + unit.getJoinUserNum();
                     a = null == unit.getAverageJoinNum() ? NumConstant.ZERO : o + unit.getAverageJoinNum();