From cd0b3f63b1ded4a7f22ee3140d189ff9cb00a745 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 六月 2022 17:27:27 +0800
Subject: [PATCH] Merge branch 'huacheng_uu' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java | 100 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 87 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
index 0cbbda9..88dd5ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -1,5 +1,12 @@
package com.panzhihua.common.model.vos.partybuilding;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,22 +20,89 @@
@Data
@ApiModel("党委")
public class PartyCommitteeVO {
- @ApiModelProperty(value = "党员id")
- private Long PartyMemberId;
- @ApiModelProperty(value = "身份id")
- private Long roleId;
- @ApiModelProperty(value = "身份名字")
- private String roleName;
- @ApiModelProperty(value = "社区id")
- private Long communityId;
- @ApiModelProperty(value = "主键")
+
+ @ApiModelProperty("主键")
private Long id;
+
+ @ApiModelProperty("电话")
+ @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("性别")
+ private Integer sex;
+
+ @ApiModelProperty("出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthTime;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty("职位")
+ @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
+ private String position;
+
+ @ApiModelProperty("职位2")
+ private String positionTwo;
+
+ @ApiModelProperty("岗位职责")
+ @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("头像图片路径")
+ @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
+ private String photoPath;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
@ApiModelProperty(value = "当前页数")
private Long pageNum;
+
@ApiModelProperty(value = "每页记录数")
private Long pageSize;
- @ApiModelProperty(value = "党员姓名")
- private String name;
- @ApiModelProperty(value = "党员照片")
- private String photoPath;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "党委标签（1.社区党委 2.区域党委委员）")
+ private Integer type;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "负责党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "负责党组织名字")
+ private String orgName;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
}
--
Gitblit v1.7.1