From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
index 142f64b..dca1493 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
@@ -1,14 +1,15 @@
package com.panzhihua.common.model.dtos.community;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
import com.google.common.base.CaseFormat;
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;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
/**
* 高领老人分页查询条件
@@ -16,7 +17,7 @@
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
* @since 1.0
- * */
+ */
@Data
@ApiModel("生存认证记录分页查询条件")
@EncryptQueryClass
@@ -32,28 +33,26 @@
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
@Pattern(regexp = "asc|desc|ASC|DESC")
- private String sortType="desc";
+ private String sortType = "desc";
@ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
- private String sortAttr="createAt";
-
- @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
- public String getSortColumns(){
- String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
- return dbColumn;
- }
-
+ private String sortAttr = "createAt";
@ApiModelProperty(value = "姓名", example = "妞妞")
private String name;
-
@EncryptQuery
@ApiModelProperty(value = "身份证号码")
private String idCard;
-
- @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）",example = "1")
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）", example = "1")
private Integer type;
-
- @ApiModelProperty(value = "认证时间(月份)",example = "1")
+ @ApiModelProperty(value = "认证时间(月份)", example = "1")
private Integer month;
+ @ApiModelProperty(value = "认证时间(年份)", example = "2021")
+ private Integer year;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
}
--
Gitblit v1.7.1