From 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 22 七月 2021 16:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 9024125..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
@@ -28,8 +28,17 @@
@Max(9223372036854775807L)
@ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
- @NotNull
+ @NotNull(message = "网格ID不能为空")
private Long gridId;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+
+ @Max(value = 6, message = "事件处理状态参数错误")
+ @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销", hidden = false, example = "1")
+ private Integer eventDealStatus;
@ApiModelProperty(value = "分页-当前页数", example = "1")
private Long pageNum = 1L;
@@ -41,7 +50,7 @@
private String sortAttr="createAt";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
- @Pattern(regexp = "asc|desc|ASC|DESC")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
private String sortType="desc";
public String getSortColumns(){
@@ -84,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 = "")
@@ -95,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")
@@ -107,13 +120,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date propagandaTimeEnd;
-
- @Max(127)
- @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报", hidden = false, example = "1")
- private Integer eventType;
-
-
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "")
private String eventDes;
@@ -123,7 +130,7 @@
private String propagandaObject;
- @Length(max=10)
+ @Length(max=8)
@ApiModelProperty(value = "宣传人数", hidden = false, example = "")
private String propagandaNum;
@@ -269,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")
@@ -276,9 +285,10 @@
@ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAtEnd;
-
-
@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