修改判断错误

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -224,8 +224,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 // 社区名义发文数量
                 List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(publishArticleCountList)) {
-                    log.error(IndexCalConstant.COMMUNITY_PUBLISH_ARTICLE_LIST_NULL);
-                }
+                    log.warn(IndexCalConstant.COMMUNITY_PUBLISH_ARTICLE_LIST_NULL);
+                } else {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
                         log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
@@ -247,6 +247,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                         });
                     }
                 }
+            }
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         log.info("communityPartyCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -222,13 +222,13 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 // 区名义发文数量
                 List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.DISTRICT_LEVEL);
                 if (CollectionUtils.isEmpty(publishArticleCountList)) {
-                    log.error(IndexCalConstant.DISTRICT_PUBLISH_ARTICLE_LIST_NULL);
-                }
+                    log.warn(IndexCalConstant.DISTRICT_PUBLISH_ARTICLE_LIST_NULL);
+                } else {
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
                         log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
                         return;
-                } else{
+                    } else {
                         List<BigDecimal> decimalList = publishArticleCountList.stream().map(m -> new BigDecimal(m.get(fieldNameByIndexCode).toString())).collect(Collectors.toList());
                         MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(decimalList);
                         List<List<Map<String, Object>>> publishArticleList = ListUtils.partition(publishArticleCountList, IndexCalConstant.PAGE_SIZE);
@@ -245,6 +245,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         });
                     }
                 }
+            }
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -226,13 +226,13 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 // 街道名义发文数量
                 List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId, IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(mapList)) {
-                    log.error(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
-                }
+                    log.warn(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
+                } else {
                     String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldName)) {
                         log.error(String.format(IndexCalConstant.INDEX_CODE_NULL, detail.getIndexCode()));
                         return;
-                }else{
+                    } else {
                         MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(mapList.stream().map(m -> new BigDecimal(m.get(fieldName).toString())).collect(Collectors.toList()));
                         List<List<Map<String, Object>>> publishArticleList = ListUtils.partition(mapList, IndexCalConstant.PAGE_SIZE);
                         publishArticleList.forEach(publish -> {
@@ -248,6 +248,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                         });
                     }
                 }
+            }
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);