代码规范修改

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;
+
 }

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;
+
 
 
 }

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_id AS id,
-            twt.team_name AS teamName,
+        twt.bid_code AS parentId,
-            twt.bid_code AS parentId,
+        twt.team_name AS title
-            '' AS phone
         FROM
         tb_work_team twt
         WHERE
@@ -32,17 +31,16 @@
         UNION ALL
 
         SELECT
-            ttp.user_id AS id,
+        ttp.user_id AS id,
-            ttp.team_id AS parentId,
+        ttp.team_id AS parentId,
-            ttp.user_name AS teamName,
+        CONCAT(ttp.user_name, ' (', ttp.phone, ')') AS title
-            ttp.phone AS phone
         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>
     <!--人员管控-人员运动趋预警-->