From 2dbd65c087d193db8f084be2dabe5e91f54ad7a1 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 24 五月 2021 15:21:45 +0800
Subject: [PATCH] change:随手拍、一起议、微心愿 添加昵称字段
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index aa38261..33c6cac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -25,18 +25,15 @@
private Long id;
@ApiModelProperty("活动名称")
- @NotBlank
private String activityName;
@ApiModelProperty("负责人userID")
- @NotNull
private Long sponsorId;
@ApiModelProperty("负责人名字")
private String sponsorName;
@ApiModelProperty("活动地址")
- @NotBlank
private String activityAddr;
@ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -45,25 +42,21 @@
@ApiModelProperty("发布时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date publishAt;
-
@ApiModelProperty("活动结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @NotNull
private Date endAt;
+
@ApiModelProperty("活动开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @NotNull
private Date beginAt;
@ApiModelProperty("报名开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @NotNull
private Date signUpBegin;
@ApiModelProperty("报名结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @NotNull
private Date signUpEnd;
@ApiModelProperty("志愿者人数下线")
@@ -72,14 +65,19 @@
@ApiModelProperty("志愿者人数上限")
private Integer volunteerMax;
+ @ApiModelProperty("当前志愿者数量")
+ private Integer volunteerNow;
+
@ApiModelProperty("参与者人数下线")
private Integer participantMin;
@ApiModelProperty("参与者人数上限")
private Integer participantMax;
+ @ApiModelProperty("当前参与者数量")
+ private Integer participantNow;
+
@ApiModelProperty("活动封面")
- @NotNull
private String cover;
@ApiModelProperty("是否有奖品 1 有 0 无")
@@ -89,11 +87,9 @@
private String prizeRemark;
@ApiModelProperty("奖励说明")
- @NotBlank
private String rewardDesc;
@ApiModelProperty("活动内容")
- @NotBlank
private String content;
@ApiModelProperty("活动奖品集合")
@@ -102,6 +98,9 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
@ApiModelProperty(value = "当前页数",example="1")
private Long pageNum;
@@ -109,7 +108,47 @@
private Long pageSize;
@ApiModelProperty(value = "取消原因")
- @Length(max = 200,message = "取消原因限制200字以内")
- private String cancelRenson;
+ private String cancelReason;
+
+ @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
+ private Integer isSign;
+
+ @ApiModelProperty(value = "是不是以志愿者身份报名的 1 是 0 不是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty(value = "当前登录者id",hidden = true)
+ private Integer userId;
+
+ @ApiModelProperty("活动参加普通人员集合")
+ private List<ActivitySignVO>activitySignVOList;
+
+ @ApiModelProperty("活动参加志愿者人员集合")
+ private List<ActivitySignVO>activityVolunteerList;
+
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ private Integer type;
+
+ @ApiModelProperty("活动创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "是否是小程序访问 1 是 ",hidden = true)
+ private Integer isApplets;
+
+ @ApiModelProperty("活动积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "是不是请求进行中 1 是",hidden = true)
+ private Integer isIng;
+
+ @ApiModelProperty("用户实际报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date singDate;
+
+ @ApiModelProperty("党员活动是否个人发布 1 是 0 否")
+ private Integer isPerson;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
}
--
Gitblit v1.7.1