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 stZvalMap = zvarlBS.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW)); - List list = zvarlBS.stream().map(StZvarlB::getRz).collect(Collectors.toList()); + List 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= 0 && rz.compareTo(list.get(i+1)) <= 0) { lowerRz = list.get(i); upperRz = list.get(i+1);