From 8518a82f4918629d5f27bff9ac0e404c32b80cf7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:41:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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 bc224dd..4c75cb0 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
@@ -9,6 +9,8 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -91,13 +93,13 @@
@ApiModelProperty("当前志愿者数量")
private Integer volunteerNow;
- @ApiModelProperty("参与者人数下线")
+ @ApiModelProperty("居民人数下线")
private Integer participantMin;
- @ApiModelProperty("参与者人数上限（不填写则默认不限人数）")
+ @ApiModelProperty("居民人数上限（不填写则默认不限人数）")
private Integer participantMax;
- @ApiModelProperty("当前参与者数量")
+ @ApiModelProperty("当前居民数量")
private Integer participantNow;
@ApiModelProperty("活动封面")
@@ -156,6 +158,9 @@
@ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+
@ApiModelProperty(value = "社区名称")
private String communityName;
@@ -171,8 +176,8 @@
@ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
private Integer isSign = 0;
- @ApiModelProperty(value = "是不是以志愿者身份报名的 1 是 0 不是")
- private Integer isVolunteer = 0;
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
@ApiModelProperty(value = "当前登录者id", hidden = true)
private Long userId;
@@ -183,7 +188,10 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动 5服务活动")
+ @ApiModelProperty("活动参加党员人员集合")
+ private List<ActivitySignVO> activityPbList;
+
+ @ApiModelProperty("活动类型 1 社区活动 4项目活动 5服务活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -217,11 +225,23 @@
@NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
private Integer haveIntegralReward;
- @ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
- private Integer rewardWay;
+ @ApiModelProperty("居民积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer participantRewardWay;
- @ApiModelProperty("参与签到/打卡奖励积分")
- private Integer rewardIntegral;
+ @ApiModelProperty("居民参与签到/打卡奖励积分")
+ private Integer participantRewardIntegral;
+
+ @ApiModelProperty("志愿者积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer volunteerRewardWay;
+
+ @ApiModelProperty("志愿者参与签到/打卡奖励积分")
+ private Integer volunteerRewardIntegral;
+
+ @ApiModelProperty("党员积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer pbRewardWay;
+
+ @ApiModelProperty("党员参与签到/打卡奖励积分")
+ private Integer pbRewardIntegral;
@ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
private Integer limit;
@@ -272,6 +292,10 @@
*/
@ApiModelProperty("党员参与者人数上限")
private Integer partyMemberMax;
+
+ @ApiModelProperty("当前党员数量")
+ private Integer partyMemberNow;
+
/**
* 签退范围，默认0无限制
*/
@@ -300,6 +324,16 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long checkUnitId;
+ @ApiModelProperty("活动话题id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long topicId;
+
+ @ApiModelProperty("活动邀请人员")
+ private List<ActivityInviteDTO> activityInviteList;
+
@ApiModelProperty(value = "街道id", hidden = true)
private Long streetId;
+
+ @ApiModelProperty("清单信息")
+ private ComActNeighborCircleDetailAppVO listDetail;
}
--
Gitblit v1.7.1