From 51ba2f4fa0708438b0aecb49e24d2482fb8c4af2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 06 八月 2021 10:50:46 +0800
Subject: [PATCH] 实有人口新增模板导入
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 9e0a2d1..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,10 +22,17 @@
public class EventDetailsVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
+
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
@ApiModelProperty(value = "服务单号")
private String orderSn;
+
+ @ApiModelProperty(value = "事件类型")
+ private String EventClazz;
@ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
private Long eventCategory;
@@ -34,13 +44,21 @@
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 = "网格员名字")
private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员头像")
+ private String gridMemberImageUrl;
@ApiModelProperty(value = "网格员联系方式")
private String gridMemberTelephone;
@@ -49,7 +67,7 @@
private String eventTitle;
@ApiModelProperty(value = "宣传类型")
- private Integer propagandaType;
+ private String propagandaType;
@ApiModelProperty(value = "宣传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -74,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;
@@ -91,6 +112,10 @@
@ApiModelProperty(value = "处理人ID")
private Long processUserId;
+
+ @ApiModelProperty(value = "处理流程记录ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long processRecordId;
@ApiModelProperty(value = "处理人名称")
private String processUserName;
@@ -139,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")
@@ -167,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