java/zhihuishenqu.git

			@@ -4,7 +4,11 @@
			import java.util.Date;
			import java.util.List;

			import javax.validation.constraints.NotBlank;
			import javax.validation.constraints.NotNull;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.panzhihua.common.validated.AddGroup;

			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -24,6 +28,7 @@
			private Long id;

			@ApiModelProperty("活动名称")
			@NotBlank(groups = AddGroup.class, message = "活动名称不可为空")
			private String activityName;

			@ApiModelProperty("负责人userID")
			@@ -33,12 +38,15 @@
			private String sponsorName;

			@ApiModelProperty("活动地址")
			@NotBlank(groups = AddGroup.class, message = "活动地址不可为空")
			private String activityAddr;

			@ApiModelProperty("纬度")
			@NotBlank(groups = AddGroup.class, message = "纬度不可为空")
			private String lat;

			@ApiModelProperty("经度")
			@NotBlank(groups = AddGroup.class, message = "经度不可为空")
			private String lng;

			@ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
			@@ -47,20 +55,25 @@
			@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(groups = AddGroup.class, message = "活动结束时间不可为空")
			private Date endAt;

			@ApiModelProperty("活动开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@NotNull(groups = AddGroup.class, message = "活动开始时间不可为空")
			private Date beginAt;

			@ApiModelProperty("报名开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@NotNull(groups = AddGroup.class, message = "报名开始时间不可为空")
			private Date signUpBegin;

			@ApiModelProperty("报名结束时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@NotNull(groups = AddGroup.class, message = "报名结束时间不可为空")
			private Date signUpEnd;

			@ApiModelProperty("参加人群（多个以逗号隔开）")
			@@ -85,6 +98,7 @@
			private Integer participantNow;

			@ApiModelProperty("活动封面")
			@NotBlank(groups = AddGroup.class, message = "活动封面不可为空")
			private String cover;

			@ApiModelProperty("是否有奖品 1 有 0 无")
			@@ -100,6 +114,7 @@
			private String contactName;

			@ApiModelProperty("联系人电话")
			@NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
			private String contactPhone;

			@ApiModelProperty("是否签到 1 是 0否")
			@@ -115,6 +130,7 @@
			private String rewardDesc;

			@ApiModelProperty("活动内容")
			@NotBlank(groups = AddGroup.class, message = "活动内容不可为空")
			private String content;

			@ApiModelProperty("活动奖品集合")
			@@ -191,4 +207,41 @@
			@ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
			private Integer choice;

			@ApiModelProperty("签到范围，默认0无限制")
			@NotNull(groups = AddGroup.class, message = "签到范围不可为空")
			private Integer range;

			@ApiModelProperty("是否有积分奖励（1.是 2.否）")
			@NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
			private Integer haveIntegralReward;

			@ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
			private Integer rewardWay;

			@ApiModelProperty("参与签到/打卡奖励积分")
			private Integer rewardIntegral;

			@ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
			private Integer limit;

			@ApiModelProperty("是否允许取消（1.允许 2.不允许）")
			@NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
			private Integer canCancel;

			@ApiModelProperty("取消活动扣除积分数目")
			@NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
			private Integer cancelDeduct;

			@ApiModelProperty("用户已参与次数")
			private Integer times;

			@ApiModelProperty("已获取积分")
			private Integer award;

			@ApiModelProperty("二维码类型 1居民，志愿者 2党员")
			private Integer codeType;

			@ApiModelProperty("活动类型")
			@NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
			private String activityType;
			}