From fe5975b8fc4592e3925a678c28a26563669574e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 17:05:36 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
index 03be866..a8fc526 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -1,13 +1,18 @@
package com.panzhihua.common.model.vos.community;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,38 +25,39 @@
public class ComMngVolunteerMngVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("状态：1- 申请；2 - 通过；3 - 驳回")
private Integer state;
@ApiModelProperty("姓名")
- @NotBlank(groups = {AddGroup.class},message = "姓名不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
private String name;
@ApiModelProperty("电话号码")
private String phone;
@ApiModelProperty("照片路径")
- @NotBlank(groups = {AddGroup.class},message = "照片不能为空")
private String photoPath;
@ApiModelProperty("政治面貌：1 - 党员；2- 团员；3 - 群众")
- @Min(value = 1,groups = {AddGroup.class},message = "政治面貌不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "政治面貌不能为空")
private Integer politicalFace;
@ApiModelProperty("拒绝原因")
private String rejectReson;
@ApiModelProperty("申请原因")
- @NotBlank(groups = {AddGroup.class},message = "申请原因不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "申请原因不能为空")
private String applyReson;
@ApiModelProperty("居住地址")
- @NotBlank(groups = {AddGroup.class},message = "居住地址不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "居住地址不能为空")
private String address;
@ApiModelProperty("当前页数")
@@ -60,11 +66,66 @@
@ApiModelProperty("每页记录数")
private Long pageSize;
- @ApiModelProperty(value = "年龄",example = "15")
- @Min(value = 1,groups = {AddGroup.class},message = "年龄不能为空")
+ @ApiModelProperty(value = "年龄", example = "15")
+ @Min(value = 1, groups = {AddGroup.class}, message = "年龄不能为空")
private Integer age;
- @ApiModelProperty(value = "职业",example = "家庭主妇")
- @NotBlank(groups = {AddGroup.class},message = "职业不能为空")
+ @ApiModelProperty(value = "职业", example = "家庭主妇")
+ @NotBlank(groups = {AddGroup.class}, message = "职业不能为空")
private String job;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "积分", hidden = true)
+ private Integer integral;
+
+ @ApiModelProperty(value = "用户userid", hidden = true)
+ @Deprecated
+ private Long userId;
+
+ @ApiModelProperty(value = "申请提交人ID", hidden = true)
+ private Long submitUserId;
+
+ private Long streetId;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "队伍id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "技能id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long skillId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "队伍名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "技能名称")
+ private String skillName;
+
+ @ApiModelProperty(value = "服务类型id")
+ private Long serviceTypeId;
+
+ @ApiModelProperty(value = "服务类型名称")
+ private String serviceTypeName;
+
+ @ApiModelProperty(value = "是否是在校大学生（1.是 2.否）")
+ private Integer isUniversity;
+
+ @Length(max = 30)
+ @ApiModelProperty(value = "大学名称")
+ private String universityName;
+
+ private String communityName;
}
--
Gitblit v1.7.1