From f79e169e0f00b253e3df4f9e1f3535c8dcad61f9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 30 七月 2024 17:34:44 +0800
Subject: [PATCH] 完善代码

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 6fb51ff..187f1e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -378,8 +378,11 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
+      <if test="intakeId != null">
+        and rasl.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 rasl.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
@@ -416,7 +419,7 @@
     rasl.alarm_valve as alarmValve,
     rasl.power_type as powerType
     from rm_alarm_state_last rasl
-    Left join pr_intake pint on intake_id = pint.id
+    Left join pr_intake pint on rasl.intake_id = pint.id
     <where>
       <if test="alarmState == 1">
         and (
@@ -459,6 +462,9 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
+      <if test="intakeId != null">
+        and rasl.intake_id = #{intakeId}
+      </if>
       <if test="intakeName != null">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
@@ -469,7 +475,7 @@
         and rasl.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
       </if>
     </where>
-    ORDER BY rasl.dt DESC
+    ORDER BY rasl.id DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>

--
Gitblit v1.8.0