From b0ccb0c3aed69745cfe44f8b0707becf56b56f6e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 15:20:58 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 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 fd4ba43..0726f26 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,7 +6,8 @@
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.validated.AddGroup;
@@ -25,6 +26,7 @@
public class ComActActivityVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动名称")
@@ -114,7 +116,6 @@
private String contactName;
@ApiModelProperty("联系人电话")
- @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
private String contactPhone;
@ApiModelProperty("是否签到 1 是 0否")
@@ -181,7 +182,7 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动 5服务活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -229,7 +230,6 @@
private Integer canCancel;
@ApiModelProperty("取消活动扣除积分数目")
- @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
private Integer cancelDeduct;
@ApiModelProperty("用户已参与次数")
@@ -243,4 +243,59 @@
@ApiModelProperty("活动类型")
private String activityType;
+
+ private String areaCode;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
+
+ @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("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")
+ private Long relationId;
+ @ApiModelProperty("关联手机")
+ private String phone;
+ @ApiModelProperty("单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Long streetId;
}
--
Gitblit v1.7.1