From 3b5d642459af24fa3cad7536edee230989e01d4c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 七月 2024 14:02:23 +0800
Subject: [PATCH] 机构标签与名称去掉枚举实现方式，改为全部从配置文件中得到。
---
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