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/dtos/grid/PageEventDTO.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
index 452f758..56a03f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
@@ -32,7 +32,7 @@
     private Long gridId;
 
     @Max(127)
-    @ApiModelProperty(value = "事件分类:1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
+    @ApiModelProperty(value = "事件分类:1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1", required = true)
     @NotNull(message = "事件分类不能为空")
     private Integer eventType;
 
@@ -93,6 +93,10 @@
     @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
     private String gridMemberName;
 
+    @Length(max=100)
+    @ApiModelProperty(value = "事件类型", hidden = false, example = "")
+    private String eventClazz;
+
 
     @Length(max=20)
     @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
@@ -104,9 +108,9 @@
     private String eventTitle;
 
 
-    @Max(127)
+    @Length(max=255)
     @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
-    private Integer propagandaType;
+    private String propagandaType;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -116,7 +120,7 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date propagandaTimeEnd;
 
-    @Length(max=255)
+    @Length(max=500)
     @ApiModelProperty(value = "事件描述", hidden = false, example = "")
     private String eventDes;
 
@@ -126,7 +130,7 @@
     private String propagandaObject;
 
 
-    @Length(max=10)
+    @Length(max=8)
     @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
     private String propagandaNum;
 
@@ -272,6 +276,8 @@
     @ApiModelProperty(value = "修改人", hidden = false, example = "1")
     private Long updateBy;
 
+    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+    private Integer revokeType;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
@@ -282,4 +288,7 @@
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;
 
+    @ApiModelProperty(value = "是否查询全部(1.是 2.否)", hidden = false, example = "true")
+    private Integer isAll;
+
 }

--
Gitblit v1.7.1