From bd927f5c9f26d5ae89a272e56a4b3bd655bd148f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
index 2581eca..33464a1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
@@ -1,15 +1,17 @@
package com.panzhihua.common.model.dtos.community;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
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 org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Pattern;
/**
* 分页查询表单
@@ -18,7 +20,7 @@
* @version 1.0
* @since 1.0
* @date 2021-06-09
- * */
+ */
@Data
@ApiModel("查询用户绑定老人关系请求参数")
@EncryptQueryClass
@@ -31,63 +33,45 @@
private Long pageSize = 10L;
@ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
- private String sortAttr="createAt";
+ private String sortAttr = "createAt";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
@Pattern(regexp = "asc|desc|ASC|DESC")
- private String sortType="desc";
-
- @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
- public String getSortColumns(){
- String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
- return dbColumn;
- }
-
-
+ private String sortType = "desc";
@Max(9223372036854775807L)
@ApiModelProperty(value = "主键id", hidden = false, example = "1")
private Long id;
-
-
@Max(9223372036854775807L)
@ApiModelProperty(value = "用户id", hidden = false, example = "1")
private Long userId;
-
-
@Max(127)
@ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)", hidden = false, example = "1")
private Integer relation;
-
-
@Max(127)
@ApiModelProperty(value = "是否已认证（1.是 2.否）", hidden = false, example = "1")
private Integer isAuth;
-
-
- @Length(max=50)
+ @Length(max = 50)
@ApiModelProperty(value = "姓名", hidden = false, example = "")
private String name;
-
-
- @Length(max=50)
+ @Length(max = 50)
@EncryptQuery
@ApiModelProperty(value = "身份证号码", hidden = false, example = "")
private String idCard;
-
-
@Max(9223372036854775807L)
@ApiModelProperty(value = "社区id", hidden = false, example = "1")
private Long communityId;
-
-
@Max(9223372036854775807L)
@ApiModelProperty(value = "高龄老人库id", hidden = false, example = "1")
private Long bigAgeId;
-
-
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long operUserId;
@ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
private String operUserName;
+ @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