From ccff69c44c520fb70ce7e1316a7de8cecaadafd3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 02 三月 2022 10:51:13 +0800
Subject: [PATCH] 三社功能修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 d3239dc..a9ece31 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
@@ -77,7 +77,6 @@
private Date signUpEnd;
@ApiModelProperty("参加人群（多个以逗号隔开）")
- @NotBlank(groups = AddGroup.class, message = "参加人群不可为空")
private String aattendPeople;
@ApiModelProperty("志愿者人数下线")
@@ -182,7 +181,7 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -222,7 +221,7 @@
@ApiModelProperty("参与签到/打卡奖励积分")
private Integer rewardIntegral;
- @ApiModelProperty("参与次数上限，按次奖励需传入")
+ @ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
private Integer limit;
@ApiModelProperty("是否允许取消（1.允许 2.不允许）")
@@ -233,9 +232,49 @@
@NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
private Integer cancelDeduct;
- @ApiModelProperty("参与次数")
+ @ApiModelProperty("用户已参与次数")
private Integer times;
@ApiModelProperty("已获取积分")
private Integer award;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+ @ApiModelProperty("活动类型")
+ @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
+ private String activityType;
+
+ @ApiModelProperty("项目Id")
+ private Long projectId;
+
+ @ApiModelProperty("项目名称")
+ private String projectName;
+
+ @ApiModelProperty("社工数")
+ private Integer socialCount;
+
+
+ /**
+ * 党员参与者人数下线
+ */
+ @ApiModelProperty("党员参与者人数下线")
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ @ApiModelProperty("党员参与者人数上限")
+ private Integer partyMemberMax;
+ /**
+ * 签退范围，默认0无限制
+ */
+ @ApiModelProperty("签退范围，默认0无限制")
+ private Integer signOutRange;
+
+ @ApiModelProperty("单次活动时长")
+ private Integer activityTime;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
}
--
Gitblit v1.7.1