From 621cc8f0c685549b0d19afc88a6a944ec4a0a14d Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 8 Nov 2023 11:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/wisdom/mapper/AiMonitorAlarmMapper.java | 1 -
 .../xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml   | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AiMonitorAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AiMonitorAlarmMapper.java
index fd5da68..28259b0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AiMonitorAlarmMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AiMonitorAlarmMapper.java
@@ -30,7 +30,6 @@ public interface AiMonitorAlarmMapper extends BaseMapper<AiMonitorAlarm> {
 
     Integer getCountForToDay(String projectSn, String engineeringSn, Integer type);
 
-
     Integer statByState();
 
     Integer statByEngineering();
diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml
index e573887..01aabc3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml
@@ -3,8 +3,10 @@
 <mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorAlarmMapper">
 
     <select id="pageList" resultType="com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm">
-        SELECT a.*, d.`name` as deviceName FROM ai_monitor_alarm a
+        SELECT a.*, d.`name` as deviceName, p.project_name, e.engineering_name FROM ai_monitor_alarm a
              LEFT JOIN ai_monitor_dev d ON a.device_code = d.`code` AND a.hardware_id = d.hardware_id
+             LEFT JOIN project p ON a.project_sn = p.project_sn
+             LEFT JOIN engineering e ON a.engineering_sn = e.engineering_sn
              ${ew.customSqlSegment}
     </select>