From ecd74ef4846bc6e5debbf78eb908b97d3d9abc94 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 19 Jun 2024 14:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=A2=9E=E5=8A=A0=E5=BA=94?=
 =?UTF-8?q?=E6=80=A5=E4=BA=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XzEmergencyRecordController.java      | 10 ----------
 .../xz/emergency/entity/XzEmergencyRecord.java       |  4 ++++
 .../emergency/mapper/xml/XzEmergencyRecordMapper.xml | 12 +++++++++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyRecordController.java
index 4da774630..e56ddacda 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/controller/XzEmergencyRecordController.java
@@ -161,14 +161,4 @@ public class XzEmergencyRecordController {
         return Result.success(xzEmergencyRecordService.countAlarmNumByEnterprise(param));
     }
 
-    @ApiOperation(value = "统计烟感报警数据", notes = "统计烟感报警数据", httpMethod = "POST")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
-    })
-    @PostMapping(value = "/queryById")
-    public Result queryById(@ApiIgnore @RequestBody Map<String, Object> param) {
-        return Result.success(queryById(param));
-    }
-
-
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java
index fe34b1ae8..3601732f6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/entity/XzEmergencyRecord.java
@@ -137,4 +137,8 @@ public class XzEmergencyRecord implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "星纵-应急-救援情况列表")
     private List<XzEmergencyRescueSituation> situations;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "应急人名称")
+    private String emergencyManager;
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml
index f7c510d2c..c76e32c3e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml
@@ -8,7 +8,8 @@
         ei.id                                                   as enterprise_id,
         ei.enterprise_name,
         wi.worker_name                                          as alarmPersonName,
-        if(t.emergency_type_id = -1, '一键报警', et.emergency_type) as emergencyTypeName
+        if(t.emergency_type_id = -1, '一键报警', et.emergency_type) as emergencyTypeName,
+        x.emergencyManager                                      as emergencyManager
     </sql>
     <sql id="selectTable">
         select
@@ -20,6 +21,15 @@
         left join team_info ti on ti.id = wi.team_id and wi.person_type=1
         left join department_info di on di.id = wi.department_id and wi.person_type=2
         left join enterprise_info ei on ei.id = wi.enterprise_id
+        left join (
+        select
+        xep.enterprise_id,
+        xep.project_sn,
+        GROUP_CONCAT(su.real_name) as emergencyManager
+        from xz_emergency_push xep
+        join system_user su on find_in_set(su.user_id,xep.emergency_manager_id)
+        group by xep.enterprise_id,xep.project_sn
+        ) x on x.enterprise_id = ei.id and x.project_sn=t.project_sn
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord">
         <include refid="selectTable">