From bddad8b22f9b505274a8c2904d9d81efda89f497 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 13:08:36 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
index ce0d976..216e1ba 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -1,17 +1,20 @@
package com.panzhihua.common.model.dtos.community;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import org.hibernate.validator.constraints.Length;
+import java.util.Date;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
-import java.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 分页查询表单
@@ -19,25 +22,26 @@
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
* @since 1.0
- * */
+ */
@Data
@ApiModel("查询高龄认证请求参数")
+@EncryptQueryClass
public class PageEldersAuthDTO {
@ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
@NotNull
private Long pageNum = 1L;
- @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
@NotNull
private Long pageSize = 10L;
@ApiModelProperty(value = "排序字段, 默认createAt", hidden = true, example = "createAt")
- private String sortBy="create_at";
+ private String sortBy = "create_at";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
@Pattern(regexp = "asc|desc|ASC|DESC")
- private String order="desc";
+ private String order = "desc";
@Max(9223372036854775807L)
@ApiModelProperty(value = "ID", hidden = false, example = "1")
@@ -47,7 +51,7 @@
@ApiModelProperty(value = "创建人", hidden = false, example = "1")
private Long createBy;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间", hidden = false, example = "2021-05-01 18:05:50")
private Date createAt;
@@ -55,20 +59,20 @@
@ApiModelProperty(value = "更新人", hidden = false, example = "1")
private Long updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "更新时间", hidden = false, example = "2021-05-01 18:05:50")
private Date updateAt;
- @Length(max=18)
+ @Length(max = 18)
+ @EncryptQuery
@ApiModelProperty(value = "身份证", hidden = false, example = "")
private String idCard;
- @Length(max=32)
+ @Length(max = 32)
@ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
private String authUserName;
- @Length(max=1024)
+ @Length(max = 1024)
@ApiModelProperty(value = "视频地址", hidden = false, example = "")
private String videoUrl;
@@ -76,18 +80,35 @@
@ApiModelProperty(value = "提交人", hidden = false, example = "1")
private Long sumitUserId;
- @Length(max=1024)
+ @Length(max = 1024)
@ApiModelProperty(value = "户籍地", hidden = false, example = "")
private String domicile;
- @Length(max=1)
+ @Length(max = 1)
@ApiModelProperty(value = "状态", hidden = false, example = "")
private String status;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
private Date birthDay;
+ @ApiModelProperty(value = "导出的ID", hidden = false, example = "")
+ private Long[] ids;
+ @ApiModelProperty(value = "查询类型 1 按月 2 按时间", hidden = false, example = "")
+ private String type;
+
+ @ApiModelProperty(value = "月份(1-12)", hidden = false, example = "")
+ private Integer month;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建起始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtStart;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
+ private Date createAtEnd;
+
+ @ApiModelProperty(value = "社区ID", hidden = false, example = "")
+ private Long communityId;
}
--
Gitblit v1.7.1