From e37b74fd0813d2e3eeac13fd13c05d42f98b66e2 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Mon, 22 Dec 2025 16:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E5=B0=8FBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/hsz/service/ReservoirWaterService.java | 4 ++++ .../com/gunshi/project/hsz/service/RiceRqWaterService.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java index 0d9aa0b..9785cb9 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java @@ -211,6 +211,7 @@ public class ReservoirWaterService { if(tm != null && tm.before(currentHour)){ vo.setRz(null); vo.setTm(null); + vo.setDrpTm(null); }else if (tm != null && rz != null){ if (rz != null) { //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList); @@ -263,6 +264,9 @@ public class ReservoirWaterService { }else if(stWaterRReal2 != null){ attResBaseVo.setIrrigationFlowTm(stWaterRReal2.getTm()); } + if(totalSum == null){ + attResBaseVo.setIrrigationFlowTm(null); + } } //获取新建生态供水流量站最新得流量 String ecologyStcd = "1114"; diff --git a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java index 531eb4e..5448cfa 100644 --- a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java @@ -645,6 +645,7 @@ public class RiceRqWaterService extends ServiceImpl