From 1ed40ad4af53128228b93239be8f171f4e4e991a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 七月 2024 15:27:42 +0800
Subject: [PATCH] 2024-07-25 朱宝民 完成8个报文查询结构（整点报、开关阀报、定时报、工作报）

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml |    4 ++--
 1 files changed, 2 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 069917c..924a29c 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 (
@@ -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 (

--
Gitblit v1.8.0