From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期一, 30 八月 2021 13:13:18 +0800 Subject: [PATCH] Merge branch 'test' into 'yuyue_dev' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java index 72ad1da..7c15958 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java @@ -1,12 +1,13 @@ package com.panzhihua.common.model.dtos.community; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + import com.google.common.base.CaseFormat; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * 分页查询生存认证记录表单 @@ -15,7 +16,7 @@ * @version 1.0 * @since 1.0 * @date 2021-06-09 - * */ + */ @Data @ApiModel("查询高龄老人库请求参数") public class PageComEldersRecordsDTO { @@ -27,25 +28,23 @@ 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"; @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true) @NotNull(message = "家庭成员ID不能为空") 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