From 7af935e6a092193adf309f3a2d700f049b4b63d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 14:11:49 +0800
Subject: [PATCH] 解决冲突

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 069917c..55279e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -353,7 +353,7 @@
 <select id="getRecordCount" resultType="java.lang.Long">
     select count(*)
     from rm_alarm_state_history rash
-    Left join pr_intake pint on intake_id = pint.id
+    Left join pr_intake pint on rash.intake_id = pint.id
     <where>
        <if test="alarmState == 1">
                 and (
@@ -397,7 +397,7 @@
             and rash.valve_state = #{valveState,jdbcType=TINYINT}
         </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}
@@ -434,7 +434,7 @@
         rash.alarm_valve as alarmValve,
         rash.power_type as powerType
         from rm_alarm_state_history rash
-        Left join pr_intake pint on intake_id = pint.id
+        Left join pr_intake pint on rash.intake_id = pint.id
         <where>
             <if test="alarmState == 1">
                 and (
@@ -487,7 +487,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