From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
index c87ebdc..6157e1f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -1,6 +1,9 @@
 package com.panzhihua.common.model.vos.grid;
 
 import java.util.*;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,6 +22,7 @@
 public class EventDetailsVO {
 
     @ApiModelProperty(value = "id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	@ApiModelProperty(value = "事件处理状态")
@@ -26,6 +30,9 @@
 
     @ApiModelProperty(value = "服务单号")
 	private String orderSn;
+
+	@ApiModelProperty(value = "事件类型")
+    private String EventClazz;
 
     @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
 	private Long eventCategory;
@@ -37,9 +44,14 @@
 	private Long gridMemberCommunity;
 
     @ApiModelProperty(value = "网格ID")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long gridId;
 
+	@ApiModelProperty(value = "网格名称")
+	private String gridName;
+
     @ApiModelProperty(value = "网格员")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long gridMemberId;
 
     @ApiModelProperty(value = "网格员名字")
@@ -80,8 +92,11 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date happenTime;
 
-    @ApiModelProperty(value = "发生地点")
+    @ApiModelProperty(value = "事件发生地点备注")
 	private String happentAddress;
+
+	@ApiModelProperty(value = "事件发生地点")
+	private String happenAddress;
 
     @ApiModelProperty(value = "发生的精度纬度信息(逗号隔开)")
 	private String happentLatLng;
@@ -97,6 +112,10 @@
 
     @ApiModelProperty(value = "处理人ID")
 	private Long processUserId;
+
+	@ApiModelProperty(value = "处理流程记录ID")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long processRecordId;
 
     @ApiModelProperty(value = "处理人名称")
 	private String processUserName;
@@ -145,8 +164,11 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date submitDate;
 
-    @ApiModelProperty(value = "创建人")
+    @ApiModelProperty(value = "创建人id")
 	private Long createBy;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creator;
 
     @ApiModelProperty(value = "创建时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -173,6 +195,11 @@
 	@ApiModelProperty(value = "事件处理数据")
     private List<EventTransferRecordVO> trans;
 
+	@ApiModelProperty(value = "特殊人群列表")
+	private List<EventSpecialPopulationDetailsVO> populationList;
+
+	@ApiModelProperty(value = "网格绑定社区id")
+	private Long communityId;
 
 
 }

--
Gitblit v1.7.1