From ffb7ccc533993f6b4bfe22353c5ff19f11fa490f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 08 十二月 2022 15:02:40 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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 10cb7dc..b49c4e8 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
@@ -5,6 +5,8 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -20,19 +22,20 @@
@Data
@ApiModel("党委")
public class PartyCommitteeVO {
-
- @ApiModelProperty("主键")
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("电话")
- @NotBlank(groups = {AddGroup.class},message = "电话不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
private String phone;
-
+
@ApiModelProperty("是否注册")
private Integer isReg;
@ApiModelProperty("姓名")
- @NotBlank(groups = {AddGroup.class},message = "姓名不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
private String name;
@ApiModelProperty("性别")
@@ -41,28 +44,71 @@
@ApiModelProperty("出生日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthTime;
-
+
@ApiModelProperty(value = "年龄")
private Integer age;
@ApiModelProperty("职位")
- @NotBlank(groups = {AddGroup.class},message = "电话不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
private String position;
+ @ApiModelProperty("职位2")
+ private String positionTwo;
+
@ApiModelProperty("岗位职责")
- @NotBlank(groups = {AddGroup.class},message = "岗位职责不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
private String jobResponsibilities;
@ApiModelProperty("头像图片路径")
- @NotBlank(groups = {AddGroup.class},message = "头像不能为空")
+ @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 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;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
}
--
Gitblit v1.7.1