From ebd66fc552329cdb2f04d62ecdf49dc38272a8da Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 14:07:47 +0800
Subject: [PATCH] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=AD=98=E5=82=A8=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E3=80=82=E6=8A=A5=E4=BA=8B=E5=85=A5=E5=8F=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0userShowName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/MentionUserFormDTO.java    | 6 ++++++
 .../main/java/com/epmet/entity/ResiEventMentionEntity.java  | 5 +++++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java   | 1 +
 .../db/migration/V0.0.16__create_resievent_tables.sql       | 1 +
 4 files changed, 13 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
index 9df7be7b21..52c37f1563 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
@@ -32,4 +32,10 @@ public class MentionUserFormDTO implements Serializable {
      * 注册网格的所有上级
      */
     private String pids;
+
+    /**
+     * 人大代表姓名
+     */
+    private String userShowName;
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
index 2a6a2abe05..a2c5702485 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
@@ -50,6 +50,11 @@ public class ResiEventMentionEntity extends BaseEpmetEntity {
      */
 	private String userType;
 
+	/**
+	 * 人大代表目前显示姓名
+	 */
+	private String userShowName;
+
     /**
      * 居民端用户id
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 9d5a9e0098..ce21f19a58 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -200,6 +200,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setCustomerId(customerId);
             mentionEntity.setResiEventId(resiEventId);
             mentionEntity.setUserType(EventConstant.NPC_USER);
+            mentionEntity.setUserShowName(npc.getUserShowName());
             mentionEntity.setUserId(npc.getUserId());
             mentionEntity.setGridId(npc.getGridId());
             mentionEntity.setAgencyId(npc.getAgencyId());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index 77ffe6da1d..8aa3fab8d9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -54,6 +54,7 @@ CREATE TABLE `resi_event_mention` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
   `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
   `USER_TYPE` varchar(32) NOT NULL COMMENT '人大代表:npc_user',
+  `USER_SHOW_NAME` varchar(64) NOT NULL COMMENT '人大代表目前显示姓名',
   `USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id',
   `GRID_ID` varchar(64) NOT NULL COMMENT '居民注册网格ID',
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民所属社区，就是grid_id的所属组织',