From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index cbd32da..26ac3bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -1,14 +1,24 @@
package com.panzhihua.common.model.vos;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.util.Date;
import java.util.List;
import java.util.Set;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -45,9 +55,12 @@
private String nickName;
@ApiModelProperty("真实名字")
+ @NotBlank(groups = {AddGroup.class}, message = "真实名字不能为空")
private String name;
@ApiModelProperty("社区id")
+ @Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空")
+ @NotNull(groups = {PutGroup.class}, message = "社区id不能为空")
private Long communityId;
@ApiModelProperty("社区名字")
@@ -56,13 +69,17 @@
@ApiModelProperty("性别 1 男 2 女")
private Integer sex;
+ @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否")
+ private Integer ismemberrole;
+
@ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
@ApiModelProperty("头像")
private String imageUrl;
- @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台")
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
private Integer type;
@ApiModelProperty("职业")
@@ -96,6 +113,7 @@
private String rejectReson;
@ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号不能为空")
private String idCard;
@ApiModelProperty("标签 多个用,隔开")
@@ -104,10 +122,10 @@
@ApiModelProperty("家庭id")
private Long familyId;
- @ApiModelProperty(value = "分页每页数量",example = "10")
+ @ApiModelProperty(value = "分页每页数量", example = "10")
private Long pageSize;
- @ApiModelProperty(value = "分页当前记录数",example = "1")
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
private Long pageNum;
@ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
@@ -123,10 +141,44 @@
private List<ComMngStructHouseVO> comMngStructHouseVOS;
@ApiModelProperty("用户小区id")
+ // @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
+ // @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
private Long areaId;
+ @ApiModelProperty("用户所在社区信息")
+ private ComActVO comActVO;
+ @ApiModelProperty("小区信息")
+ private ComMngStructAreaVO comMngStructAreaVO;
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+ @ApiModelProperty("是否注册 0 否 1 是")
+ private Integer isRegister;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+
+ @ApiModelProperty("是否已实名")
+ private Boolean isRealNamed;
+
+ @ApiModelProperty("上班时间")
+ private Integer workStartTime;
+
+ @ApiModelProperty("下班时间")
+ private Integer workEndTime;
+
+ @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
+ private Integer bigAgeTips;
+
+ @ApiModelProperty("是否四长四员 1.是 2.否")
+ private Integer isFourMember;
}
--
Gitblit v1.7.1