From f4c5afb175994e3ee3ae148d27eda96699852768 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 May 2023 15:13:57 +0800
Subject: [PATCH] =?UTF-8?q?xxxd=5Fevent=E8=A1=A8=E6=96=B0=E5=A2=9E6?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/events/XxxdEventDTO.java    | 41 ++++++++++++++++---
 .../events/entity/XxxdEventEntity.java        | 39 +++++++++++++++---
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/XxxdEventDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/XxxdEventDTO.java
index 639550644..c256d0ed6 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/XxxdEventDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/XxxdEventDTO.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 
@@ -88,11 +87,6 @@ public class XxxdEventDTO implements Serializable {
      */
     private String[] audios;
 
-    /**
-     * 北上速办事件id
-     */
-	private String bssbEventId;
-
     /**
      * 处理状态：0-未处理；1-已处理；5-不予处理
      */
@@ -118,6 +112,41 @@ public class XxxdEventDTO implements Serializable {
      */
 	private Integer sync;
 
+    /**
+     * 0已接收；1已转北上速办事件；2已完结
+     */
+    private String internalStatus;
+
+    /**
+     * 北上速办事件id
+     */
+    private String bssbEventId;
+
+    /**
+     * 内部备注
+     */
+    private String internalRemark;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 社区id
+     */
+    private String communityId;
+
+    /**
+     * 街道id
+     */
+    private String streetId;
+
     /**
      * 删除标识 0：未删除，1：已删除
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/XxxdEventEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/XxxdEventEntity.java
index 2c9b1f062..fee644e94 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/XxxdEventEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/XxxdEventEntity.java
@@ -76,11 +76,6 @@ public class XxxdEventEntity extends BaseEpdcEntity {
      */
 	private String audios;
 
-    /**
-     * 北上速办事件id
-     */
-	private String bssbEventId;
-
     /**
      * 处理状态：0-未处理；1-已处理；5-不予处理
      */
@@ -106,4 +101,38 @@ public class XxxdEventEntity extends BaseEpdcEntity {
      */
 	private Integer sync;
 
+	/**
+	 * 0已接收；1已转北上速办事件；2已完结
+	 */
+	private String internalStatus;
+
+	/**
+	 * 北上速办事件id
+	 */
+	private String bssbEventId;
+
+	/**
+	 * 内部备注
+	 */
+	private String internalRemark;
+
+	/**
+	 * 网格id
+	 */
+	private String gridId;
+
+	/**
+	 * 网格名称
+	 */
+	private String gridName;
+
+	/**
+	 * 社区id
+	 */
+	private String communityId;
+
+	/**
+	 * 街道id
+	 */
+	private String streetId;
 }