From 141a414a2b4da759a0b43fb5cf70163bbb1012d5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Sep 2020 14:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=80=BC=E5=8A=A0=E4=B8=8A=E4=BA=86=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/result/MaxAndMinBigDecimalResultDTO.java    |  5 +++++
 .../impl/IndexCalculateCommunityServiceImpl.java       | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

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<BigDecimal> 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;
     }