From 9d28e5ad655effb57a1e2dc6447c38da02abcdb1 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 15 Aug 2024 17:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B0=B4=E5=BA=93=E6=B0=B4?=
 =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/service/ReservoirWaterService.java   | 2 +-
 src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
index c653282..e96f5c9 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
@@ -73,7 +73,7 @@ public class ReservoirWaterService {
                     continue;
                 }
                 Map<BigDecimal, BigDecimal> stZvalMap = zvarlBS.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW));
-                List<BigDecimal> list = zvarlBS.stream().map(StZvarlB::getRz).collect(Collectors.toList());
+                List<BigDecimal> list = zvarlBS.stream().map(StZvarlB::getRz).sorted().collect(Collectors.toList());
                 vo.setNowCap(DataHandleUtil.calcData(rz,stZvalMap,list));
             }
         }
diff --git a/src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java b/src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java
index 9aec129..927efe7 100644
--- a/src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java
+++ b/src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java
@@ -31,7 +31,7 @@ public class DataHandleUtil {
         BigDecimal lowerW = new BigDecimal(0);
         BigDecimal upperW = new BigDecimal(0);
 
-        for(int i=0;i<list.size();i++){
+        for(int i=0;i<list.size()-1;i++){
             if (rz.compareTo(list.get(i)) >= 0 && rz.compareTo(list.get(i+1)) <= 0) {
                 lowerRz = list.get(i);
                 upperRz = list.get(i+1);