From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时，不会出现时长设置过长的问题

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 884118b..cb93292 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -390,16 +390,16 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeId != null">
-        and rasl.intake_id = #{intakeId}
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeName != null">
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="startDt != null">
+      <if test="startDt != null and startDt != ''">
         and rasl.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
       </if>
-      <if test="endDt != null">
+      <if test="endDt != null and endDt != ''">
         and rasl.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
       </if>
     </where>
@@ -474,16 +474,16 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeId != null">
-        and rasl.intake_id = #{intakeId}
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeName != null">
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="startDt != null">
+      <if test="startDt != null and startDt != ''">
         and rasl.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
       </if>
-      <if test="endDt != null">
+      <if test="endDt != null and endDt != ''">
         and rasl.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
       </if>
     </where>

--
Gitblit v1.8.0