From dad584e4efa7a95ec18f37a833acfeb1f670a562 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 09:23:00 +0800
Subject: [PATCH] 网格员管理以及网格管理
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java | 66 ++++++++++++---------------------
1 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java
index ba8a6f6..3da9539 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java
@@ -32,61 +32,43 @@
@ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize = 10L;
- @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
- private String sortAttr="createAt";
-
- @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
- @Pattern(regexp = "asc|desc|ASC|DESC")
- private String sortType="desc";
-
- public String getSortColumns(){
- String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
- return dbColumn;
- }
-
-
@Max(9223372036854775807L)
- @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
- private Long id;
-
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ @ApiModelProperty(value = "网格所属街道id", hidden = false, example = "1")
private Long gridStreetId;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区id", hidden = false, example = "1")
private Long gridCommunityId;
+ @Length(max=100)
+ @ApiModelProperty(value = "关键词", hidden = false, example = "")
+ private String keyWord;
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
- private Long gridId;
-
-
- @NotBlank() @Length(max=100)
+ @Length(max=100)
@ApiModelProperty(value = "网格名称", hidden = false, example = "")
private String gridName;
+ @Length(max=100)
+ @ApiModelProperty(value = "账号昵称", hidden = true, example = "")
+ private String nickName;
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
- private Long gridMemberId;
+ @Length(max=100)
+ @ApiModelProperty(value = "登录账号", hidden = true, example = "")
+ private String account;
+ @Length(max=100)
+ @ApiModelProperty(value = "联系电话", hidden = true, example = "")
+ private String phone;
+
+ @ApiModelProperty(value = "账号状态(1.启用 2.禁用)", example = "1")
+ private Integer status;
+
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)", example = "1")
+ private Integer workStatus;
@Max(9223372036854775807L)
- @ApiModelProperty(value = "创建人", hidden = false, example = "1")
- private Long createBy;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date createAtBegin;
- @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createAtEnd;
-
+ @ApiModelProperty(value = "网格员ID", hidden = true, example = "1")
+ private String gridMemberId;
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
--
Gitblit v1.7.1