From 7adab86fc7f9767def711031716221f6144ef9ee Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 17:41:30 +0800
Subject: [PATCH] 8个接口增加可以通过取水口ID或农户ID查询

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
index 924a29c..d0fa274 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -396,8 +396,11 @@
         <if test="valveState != null">
             and rash.valve_state = #{valveState,jdbcType=TINYINT}
         </if>
+        <if test="intakeId != null">
+            and rash.intake_id = #{intakeId}
+        </if>
         <if test="intakeName != null">
-             and pint.name = #{intakeName,jdbcType=VARCHAR}
+            and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
         </if>
         <if test="startDt != null">
              and rash.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
@@ -477,6 +480,9 @@
             <if test="valveState != null">
                 and rash.valve_state = #{valveState,jdbcType=TINYINT}
             </if>
+            <if test="intakeId != null">
+                and rash.intake_id = #{intakeId}
+            </if>
             <if test="intakeName != null">
                 and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
             </if>
@@ -487,7 +493,7 @@
                 and rash.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
             </if>
         </where>
-        ORDER BY rash.dt DESC
+        ORDER BY rash.id DESC
         <if test="pageCurr != null and pageSize != null">
             LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
         </if>

--
Gitblit v1.8.0