From ba4cfd37328e50bae646999ddb344bcd4b66e35f Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 1 Apr 2024 13:50:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/screen/dto/PersonnelControlDto.java   |  3 +++
 .../entity/screen/vo/PersonnelControlVo.java     | 15 +++++++++++++++
 .../resources/mapper/PersonnelControlMapper.xml  | 16 +++++++---------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java
index 55a1880..3af25f3 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java
@@ -19,4 +19,7 @@ public class PersonnelControlDto extends ScreenParamDto {
     @ApiModelProperty(value = "建管单位id")
     private String orgId;
 
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
+
 }
diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
index 264ce02..480aec0 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
@@ -22,6 +22,21 @@ public class PersonnelControlVo {
     @ApiModelProperty("设备状态")
     private String status;
 
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("父级ID")
+    private String parentId;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("告警时间")
+    private String warningTime;
+
+    @ApiModelProperty("告警内容")
+    private String warningContent;
+
 
 
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
index d8c80b4..45bca47 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
@@ -20,10 +20,9 @@
     <!--人员管控-人员列表-->
     <select id="getPersonnelList" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
         SELECT
-            twt.team_id AS id,
-            twt.team_name AS teamName,
-            twt.bid_code AS parentId,
-            '' AS phone
+        twt.team_id AS id,
+        twt.bid_code AS parentId,
+        twt.team_name AS title
         FROM
         tb_work_team twt
         WHERE
@@ -32,17 +31,16 @@
         UNION ALL
 
         SELECT
-            ttp.user_id AS id,
-            ttp.team_id AS parentId,
-            ttp.user_name AS teamName,
-            ttp.phone AS phone
+        ttp.user_id AS id,
+        ttp.team_id AS parentId,
+        CONCAT(ttp.user_name, ' (', ttp.phone, ')') AS title
         FROM
         t_team_people ttp
         JOIN tb_work_team twt ON ttp.team_id = twt.team_id
         WHERE
         twt.bid_code = #{bidCode}
         <if test="keyWord != null and keyWord != ''">
-            and teamName like concat('%', #{keyWord}, '%')
+            AND CONCAT(ttp.user_name, ' (', ttp.phone, ')') LIKE CONCAT('%', #{keyWord}, '%')
         </if>
     </select>
     <!--人员管控-人员运动趋预警-->