From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..96e3dfe 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突发事件", 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(){
@@ -95,9 +104,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")
@@ -106,12 +115,6 @@
@ApiModelProperty(value = "宣传时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
@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)
@ApiModelProperty(value = "事件描述", hidden = false, example = "")
@@ -276,8 +279,6 @@
@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;
--
Gitblit v1.7.1