From 23c705330a7f6e729dee965d26b530ad0cbd1aeb Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Thu, 9 Jul 2020 15:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=BA=E5=9D=9B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ActivityDetailResultDTO.java       |  5 +++
 .../result/ActivityInfoResultDTO.java         | 10 +++++
 .../epdc/smile/enums/ActUserStateEnum.java    | 41 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/smile/enums/ActUserStateEnum.java

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;
+
+/**
+ * 用户对活动的状态
+ * <P>只有可报名状态是大于0的值，其他状态为0或负值</P>
+ *
+ * @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;
+    }
+}