From f7c748120263ee6fbed1b137cbd7dad64e249c02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 11 一月 2025 12:41:34 +0800
Subject: [PATCH] 1、通信中间件中,取水口日取水量统计重新实现,统计数据来源只采用关阀报,不再采用工作报和开阀报了; 2、临时任务中,增加统计取水口是取水量统计。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index a0e21e6..c857afe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -72,11 +72,11 @@
         //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
         String timeStart = queryVo.getTimeStart();
         String timeStop = queryVo.getTimeStop();
-        if (timeStart != null || timeStart != "") {
+        if (timeStart != null && timeStart != "") {
             timeStart = timeStart + " 00:00:00";
             queryVo.setTimeStart(timeStart);
         }
-        if (timeStop != null || timeStop != "") {
+        if (timeStop != null && timeStop != "") {
             timeStop = timeStop + " 23:59:59";
             queryVo.setTimeStop(timeStop);
         }

--
Gitblit v1.8.0