From d73e378f576af0bc0cf91ff3ae53a666c27af873 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 04 一月 2025 08:42:38 +0800
Subject: [PATCH] 查询农户日用水统计的SQL语句有bug,修改。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index 9e38b46..aa2977a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -102,6 +102,7 @@
         prController.setIntakeId(intakeId);
         prController.setRtuAddr(prControllerTramp.getRtuAddr());
         prController.setProtocol(prControllerTramp.getProtocol());
+        prController.setProtocolVersion(prControllerTramp.getProtocolVersion());
         prController.setFindDt(prControllerTramp.getFindDt());
         prController.setOrgTag(prControllerTramp.getOrgTag());
         prController.setAddWays((byte) 1);
@@ -332,9 +333,9 @@
         }
 
         Integer rows = intakeControllerSv.deleteTrampController(id);
-        if (rows == 0) {
-            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
-        }
+//        if (rows == 0) {
+//            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+//        }
         return BaseResponseUtils.buildSuccess(true);
     }
 

--
Gitblit v1.8.0