forked from luyan/epmet-cloud-lingshan
wangxianzhang
3 years ago
337 changed files with 8407 additions and 324 deletions
@ -0,0 +1,36 @@ |
|||
package com.epmet.dto.form.work; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 爱心互助列表入参DTO |
|||
*/ |
|||
@Data |
|||
public class ActPageFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 6473824879249274683L; |
|||
/** |
|||
* 活动标题 |
|||
*/ |
|||
private String title; |
|||
/** |
|||
* 活动预计开始时间 |
|||
*/ |
|||
private String actStartTime; |
|||
/** |
|||
* 活动预计结束时间 |
|||
*/ |
|||
private String actEndTime; |
|||
/** |
|||
* 状态： 已发布/报名中：published； 已取消：canceled; 已结束：finished） |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* tokenDto获取 |
|||
*/ |
|||
private String customerId; |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.form.work; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2022/6/30 19:22 |
|||
*/ |
|||
@Data |
|||
public class FinishActFormDTO extends SaveActualTimeFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -4352058593501077516L; |
|||
@NotNull(message = "分值不能为空",groups =AddUserInternalGroup.class ) |
|||
private Integer reward; |
|||
private List<GrantPointsFormDTO> userList; |
|||
} |
|||
|
|||
@ -0,0 +1,183 @@ |
|||
package com.epmet.dto.result.work; |
|||
|
|||
import com.epmet.dto.result.resi.ResiActSummaryResultDTO; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.math.BigDecimal; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2022/6/30 16:47 |
|||
*/ |
|||
@Data |
|||
public class ActDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 4235569576711312094L; |
|||
|
|||
private String actId; |
|||
|
|||
/** |
|||
* 活动标题 |
|||
*/ |
|||
private String title; |
|||
|
|||
/** |
|||
* 封面图 |
|||
*/ |
|||
private String coverPic; |
|||
|
|||
/** |
|||
* 活动地点 |
|||
*/ |
|||
private String actAddress; |
|||
|
|||
/** |
|||
* 活动地点-经度 |
|||
*/ |
|||
private BigDecimal actLongitude; |
|||
|
|||
/** |
|||
* 活动地点-纬度 |
|||
*/ |
|||
private BigDecimal actLatitude; |
|||
|
|||
/** |
|||
* 活动预计开始时间yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date actStartTime; |
|||
|
|||
/** |
|||
* 活动预计结束时间yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date actEndTime; |
|||
|
|||
/** |
|||
* 活动人数 |
|||
*/ |
|||
private Integer actQuota; |
|||
|
|||
/** |
|||
* 活动积分 |
|||
*/ |
|||
private Integer reward; |
|||
|
|||
/** |
|||
* 报名审核：true：只有志愿者才可以参加活动，false: 只要是居民就可以参加活动 |
|||
*/ |
|||
private Boolean volunteerLimit; |
|||
|
|||
/** |
|||
* 报名审核： true: 需人工审核 false: 无需审核 |
|||
*/ |
|||
private Boolean auditSwitch; |
|||
|
|||
/** |
|||
* 报名截止时间：yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date signUpEndTime; |
|||
|
|||
/** |
|||
* 报名条件 |
|||
*/ |
|||
private String requirement; |
|||
|
|||
/** |
|||
* 签到开始时间：yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date signInStartTime; |
|||
|
|||
/** |
|||
* 签到结束时间: yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date signInEndTime; |
|||
|
|||
/** |
|||
* 签到地址 |
|||
*/ |
|||
private String signInAddress; |
|||
|
|||
/** |
|||
* 签到地址-纬度 |
|||
*/ |
|||
private BigDecimal signInLatitude; |
|||
|
|||
/** |
|||
* 签到地址-经度 |
|||
*/ |
|||
private BigDecimal signInLongitude; |
|||
|
|||
/** |
|||
* 签到有效范围(米) |
|||
*/ |
|||
private Integer signInRadius; |
|||
|
|||
/** |
|||
* 主办方id |
|||
*/ |
|||
private String sponsorId; |
|||
|
|||
/** |
|||
* 主办方全路径包含自身id |
|||
*/ |
|||
private String sponsorPath; |
|||
|
|||
/** |
|||
* 主办方类型：以网格名义：grid , 以机关名义： agency |
|||
*/ |
|||
private String sponsorType; |
|||
|
|||
/** |
|||
* 主办方名称 |
|||
*/ |
|||
private String sponsorName; |
|||
|
|||
/** |
|||
* 联系人 |
|||
*/ |
|||
private String sponsorContacts; |
|||
|
|||
/** |
|||
* 联系电话 |
|||
*/ |
|||
private String sponsorTel; |
|||
|
|||
/** |
|||
* 活动类型爱心活动heart 联建活动party |
|||
*/ |
|||
@JsonIgnore |
|||
private String actType; |
|||
@JsonIgnore |
|||
private String createdBy; |
|||
/** |
|||
* true:富文本；false: 原来小程序那种发布内容 |
|||
*/ |
|||
private Boolean richTextFlag; |
|||
|
|||
/** |
|||
* true，我发布的，false,其他人发布的 |
|||
*/ |
|||
private Boolean isMyPublish; |
|||
|
|||
private List<ActPreviewContentResultDTO> actContent; |
|||
|
|||
/** |
|||
* 1已经总结0未总结 |
|||
*/ |
|||
private Boolean summaryFlag; |
|||
|
|||
/** |
|||
* 只有填写了总结的才有内容 |
|||
*/ |
|||
List<ResiActSummaryResultDTO> summaryContent; |
|||
} |
|||
|
|||
@ -0,0 +1,106 @@ |
|||
package com.epmet.dto.result.work; |
|||
|
|||
import com.epmet.dto.form.work.PublishActInfoFormDTO; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2022/6/30 14:15 |
|||
*/ |
|||
@Data |
|||
public class ActPageResDTO implements Serializable { |
|||
private static final long serialVersionUID = 5330377961022020364L; |
|||
/** |
|||
*活动id |
|||
*/ |
|||
private String actId; |
|||
|
|||
/** |
|||
*活动标题 |
|||
*/ |
|||
private String title; |
|||
|
|||
/** |
|||
* 活动地点 |
|||
*/ |
|||
private String actAddress; |
|||
|
|||
/** |
|||
* 活动预计开始时间yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date actStartTime; |
|||
|
|||
/** |
|||
* 活动预计结束时间yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date actEndTime; |
|||
/** |
|||
* 报名截止时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date signUpEndTime; |
|||
|
|||
/** |
|||
* 报名开始时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date signUpStartTime; |
|||
|
|||
/** |
|||
* 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough |
|||
*/ |
|||
private String status=""; |
|||
|
|||
/** |
|||
* true:富文本；false: 原来小程序那种发布内容 |
|||
*/ |
|||
private Boolean richTextFlag; |
|||
|
|||
/** |
|||
* true，我发布的，false,其他人发布的 |
|||
*/ |
|||
private Boolean isMyPublish; |
|||
|
|||
/** |
|||
* true:固定名额 false： 不限制名额 |
|||
*/ |
|||
@JsonIgnore |
|||
private Boolean actQuotaCategory; |
|||
/** |
|||
* 活动名额人数 |
|||
*/ |
|||
@JsonIgnore |
|||
private Integer actQuota; |
|||
|
|||
/** |
|||
* 已报名人数 |
|||
*/ |
|||
@JsonIgnore |
|||
private Integer signedUp; |
|||
|
|||
/** |
|||
* 1已经总结0未总结 |
|||
*/ |
|||
private Boolean summaryFlag; |
|||
|
|||
/** |
|||
* 活动积分 |
|||
*/ |
|||
private Integer reward; |
|||
|
|||
/** |
|||
* 报名审核： true: 需人工审核 false: 无需审核 |
|||
*/ |
|||
@NotNull(message = "报名审核方式不能为空", groups = {PublishActInfoFormDTO.AddUserInternalGroup.class}) |
|||
private Boolean auditSwitch; |
|||
} |
|||
|
|||
@ -0,0 +1,108 @@ |
|||
package com.epmet.dto.result.work; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2022/6/30 17:58 |
|||
*/ |
|||
@Data |
|||
public class ActUserResDTO implements Serializable { |
|||
private static final long serialVersionUID = 7621004224467504031L; |
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String actUserRelationId; |
|||
|
|||
/** |
|||
* 活动id |
|||
*/ |
|||
private String actId; |
|||
|
|||
/** |
|||
* 用户id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String realName; |
|||
|
|||
/** |
|||
* 昵称 |
|||
*/ |
|||
private String nickName; |
|||
|
|||
/** |
|||
* 联系方式 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idNum; |
|||
|
|||
/** |
|||
* 报名时间yyyy-MM-dd HH:mm:ss |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date signUpTime; |
|||
|
|||
/** |
|||
* true: 是志愿者 false : 不是志愿者 |
|||
*/ |
|||
private Boolean volunteerFlag; |
|||
|
|||
/** |
|||
* 实际参加活动个数 |
|||
*/ |
|||
private Integer signInActNum; |
|||
/** |
|||
* 报名活动个数 |
|||
*/ |
|||
private Integer signUpActNum; |
|||
/** |
|||
* 获得积分活动个数 |
|||
*/ |
|||
private Integer obtainPointsActNum; |
|||
|
|||
/** |
|||
* 已处理: handled; 默认"",重新处理时reward_flag置为空字符串 |
|||
*/ |
|||
private String processFlag; |
|||
|
|||
/** |
|||
* 已签到:signed_in; 默认"" |
|||
*/ |
|||
private String signInFlag; |
|||
|
|||
/** |
|||
* 已给分：agree, 不给分：deny 默认"" |
|||
*/ |
|||
private String rewardFlag; |
|||
|
|||
|
|||
/** |
|||
* 当前状态（已报名/待审核auditing， |
|||
审核通过passed， |
|||
审核不通过refused |
|||
取消报名canceled， |
|||
） |
|||
*/ |
|||
private String status; |
|||
|
|||
|
|||
public ActUserResDTO(){ |
|||
this.signInActNum=0; |
|||
this.signUpActNum=0; |
|||
this.obtainPointsActNum=0; |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,12 @@ |
|||
alter table act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; |
|||
alter table act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; |
|||
alter table act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER SUMMARY_FLAG; |
|||
alter table latest_act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER AUDIT_SWITCH; |
|||
alter table latest_act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; |
|||
alter table latest_act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; |
|||
|
|||
alter table act_summary MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '总结内容'; |
|||
alter table act_summary MODIFY CONTENT_TYPE VARCHAR(32)not null COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; |
|||
|
|||
alter table act_info add COLUMN SPONSOR_PATH VARCHAR(512) comment '主办方全路径包含自身id' AFTER SPONSOR_ID; |
|||
alter table latest_act_info add COLUMN SPONSOR_PATH VARCHAR(512) comment '主办方全路径包含自身id' AFTER SPONSOR_ID; |
|||
@ -0,0 +1,4 @@ |
|||
alter table act_info MODIFY COLUMN |
|||
`SPONSOR_TEL` varchar(64) NOT NULL COMMENT '联系电话' AFTER SPONSOR_CONTACTS; |
|||
|
|||
alter table latest_act_info MODIFY COLUMN `SPONSOR_TEL` varchar(64)COMMENT '联系电话' AFTER SPONSOR_CONTACTS; |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue