diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/MaxAndMinBigDecimalResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/MaxAndMinBigDecimalResultDTO.java index aa9f471405..d5ca95dab8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/MaxAndMinBigDecimalResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/MaxAndMinBigDecimalResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.screen.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -18,4 +19,8 @@ public class MaxAndMinBigDecimalResultDTO implements Serializable { private BigDecimal max; + public MaxAndMinBigDecimalResultDTO() { + this.min = new BigDecimal(NumConstant.ZERO); + this.max = new BigDecimal(NumConstant.ZERO); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java index 5d9523550c..dfc2426e33 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java @@ -451,11 +451,13 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni * @date 2020/8/27 1:30 下午 */ public MaxAndMinBigDecimalResultDTO getMaxAndMinBigDecimal(List list) { - BigDecimal max = Collections.max(list); - BigDecimal min = Collections.min(list); MaxAndMinBigDecimalResultDTO result = new MaxAndMinBigDecimalResultDTO(); - result.setMax(max); - result.setMin(min); + if(!CollectionUtils.isEmpty(list)) { + BigDecimal max = Collections.max(list); + BigDecimal min = Collections.min(list); + result.setMax(max); + result.setMin(min); + } return result; }