diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityDetailResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityDetailResultDTO.java index 76edc79..dc25d85 100644 --- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityDetailResultDTO.java +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityDetailResultDTO.java @@ -83,6 +83,11 @@ public class ActivityDetailResultDTO implements Serializable { */ private String signUpFlag; + /** + * 当前用户是否已报名此活动 + */ + private String signUpFlagStr; + /** * 联系人 */ diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityInfoResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityInfoResultDTO.java index 459fd54..e45527c 100644 --- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityInfoResultDTO.java +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/dto/activity/result/ActivityInfoResultDTO.java @@ -63,6 +63,11 @@ public class ActivityInfoResultDTO implements Serializable { */ private Date actStartTime; + /** + * 报名截止时间 + */ + private Date signUpEndTime; + /** * 活动结束时间 */ @@ -88,6 +93,11 @@ public class ActivityInfoResultDTO implements Serializable { */ private String signUpFlag; + /** + * 当前用户是否已报名此活动 + */ + private String signUpFlagStr; + /** * 活动地址 */ diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/enums/ActUserStateEnum.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/enums/ActUserStateEnum.java new file mode 100644 index 0000000..d68fe8d --- /dev/null +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/enums/ActUserStateEnum.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.smile.enums; + +import com.elink.esua.epdc.commons.tools.constant.NumConstant; + +/** + * 用户对活动的状态 + *
只有可报名状态是大于0的值,其他状态为0或负值
+ * + * @author work@yujt.net.cn + * @date 2020/7/9 14:40 + */ +public enum ActUserStateEnum { + + SING_UP(NumConstant.ONE_STR, "报名"), + ENTERED(NumConstant.ZERO_STR, "已报名"), + CLOSED(NumConstant.ONE_NEG_STR, "已截止"), + FULL(NumConstant.TWO_NEG_STR, "已报满"), + GOING(NumConstant.THREE_NEG_STR, "进行中"), + /** + * 活动进行中,但用户未报名 + */ + ONLOOKER(NumConstant.FOUR_NEG_STR, "未报名"), + END(NumConstant.FIVE_NEG_STR, "已结束"); + + + private String value; + private String state; + + ActUserStateEnum(String value, String state) { + this.value = value; + this.state = state; + } + + public String getValue() { + return value; + } + + public String getState() { + return state; + } +}