From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:47:41 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 14 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 a969be1..95e4457 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
@@ -6,8 +6,11 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-
+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;
@@ -25,6 +28,7 @@
public class ComActActivityVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动名称")
@@ -32,6 +36,7 @@
private String activityName;
@ApiModelProperty("负责人userID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long sponsorId;
@ApiModelProperty("负责人名字")
@@ -88,13 +93,13 @@
@ApiModelProperty("当前志愿者数量")
private Integer volunteerNow;
- @ApiModelProperty("参与者人数下线")
+ @ApiModelProperty("居民人数下线")
private Integer participantMin;
- @ApiModelProperty("参与者人数上限（不填写则默认不限人数）")
+ @ApiModelProperty("居民人数上限（不填写则默认不限人数）")
private Integer participantMax;
- @ApiModelProperty("当前参与者数量")
+ @ApiModelProperty("当前居民数量")
private Integer participantNow;
@ApiModelProperty("活动封面")
@@ -114,7 +119,6 @@
private String contactName;
@ApiModelProperty("联系人电话")
- @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
private String contactPhone;
@ApiModelProperty("是否签到 1 是 0否")
@@ -169,8 +173,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;
@@ -181,7 +185,10 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ @ApiModelProperty("活动参加党员人员集合")
+ private List<ActivitySignVO> activityPbList;
+
+ @ApiModelProperty("活动类型 1 社区活动 4项目活动 5服务活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -215,11 +222,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;
@@ -229,7 +248,6 @@
private Integer canCancel;
@ApiModelProperty("取消活动扣除积分数目")
- @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
private Integer cancelDeduct;
@ApiModelProperty("用户已参与次数")
@@ -242,6 +260,77 @@
private Integer codeType;
@ApiModelProperty("活动类型")
- @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
private String activityType;
+
+ private String areaCode;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
+
+ @ApiModelProperty("项目Id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long projectId;
+
+ @ApiModelProperty("项目名称")
+ private String projectName;
+
+ @ApiModelProperty("社工数")
+ private Integer socialCount;
+
+
+ /**
+ * 党员参与者人数下线
+ */
+ @ApiModelProperty("党员参与者人数下线")
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ @ApiModelProperty("党员参与者人数上限")
+ private Integer partyMemberMax;
+
+ @ApiModelProperty("当前党员数量")
+ private Integer partyMemberNow;
+
+ /**
+ * 签退范围，默认0无限制
+ */
+ @ApiModelProperty("签退范围，默认0无限制")
+ private Integer signOutRange;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
+
+ @ApiModelProperty("是否可以评价 1是 0 否")
+ private Integer isComment;
+
+ private Integer signCount;
+
+ private Integer registerCount;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
+ @ApiModelProperty("关联服务id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long relationId;
+ @ApiModelProperty("关联手机")
+ private String phone;
+ @ApiModelProperty("单位id")
+ @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