From 73710b49c3378ae14053e83c35241336603e775d Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Sun, 29 Sep 2024 17:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E6=B0=B4=E6=83=85=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/service/ReservoirWaterService.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 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 1ac6666..4a035db 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
@@ -182,12 +182,11 @@ public class ReservoirWaterService {
         //最新水位时间往前推24小时水位
         LocalDateTime now = LocalDateTime.ofInstant(tm.toInstant(), ZoneId.systemDefault());
         LocalDateTime dateTime = now.minusDays(1);
-        BigDecimal oldRz = attResBaseMapper.oldRz(stcd,1,Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant()));
+        BigDecimal oldRz = attResBaseMapper.oldRz(stcd,2,Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant()));
 
-        if(oldRz == null){
-            return vo;
+        if(oldRz != null){
+            vo.setRzDiff(rz.subtract(oldRz));
         }
-        vo.setRzDiff(rz.subtract(oldRz));
 
         //本年最高水位
         BigDecimal maxYearRz = queryYearRzByStcdAndTime(stcd);