From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java
index 241dc57..1571c01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java
@@ -1,16 +1,15 @@
package com.panzhihua.common.model.dtos.grid;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
import com.google.common.base.CaseFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.util.Date;
/**
* 分页查询表单
@@ -19,7 +18,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("查询宣传教育事件请求参数")
public class PagePublicityEventCommunityDTO {
@@ -28,7 +27,7 @@
@ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 已发布、5 草稿箱、6已撤销", hidden = false, example = "1")
private Integer eventDealStatus;
- @Length(max=50)
+ @Length(max = 50)
@ApiModelProperty(value = "关键词", example = "")
private String keyWord;
@@ -39,24 +38,20 @@
private Long pageSize = 10L;
@ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
- private String sortAttr="createAt";
+ private String sortAttr = "createAt";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
@Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
- private String sortType="desc";
+ private String sortType = "desc";
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
- public String getSortColumns(){
+ public String getSortColumns() {
String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
return dbColumn;
}
-
- @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
- private Integer revokeType;
-
-
- @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
- private Long userId;
-
- @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
- private Long communityId;
}
--
Gitblit v1.7.1