From 3462a19f48a250ab53caa814407ee08007275b55 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 3 Aug 2020 17:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5-?=
 =?UTF-8?q?=20=E6=B4=BB=E5=8A=A8=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ActInfoServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 2470f86c76..01b232aa3b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         } else if (currentTime.after(actInfoEntity.getSignUpEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) {
             /*报名结束，活动未开始：显示：截止报名*/
             return ActConstant.CURRENT_STATUS_USER_END_SIGN_UP;
-        } else if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            // 活动开始-结束的时间段内： 显示:已开始
+        } else if (currentTime.after(actInfoEntity.getActStartTime())) {
+            // 活动开始以后： 显示:已开始
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
-        } else {
-            // 最后，显示：已结束
-            return ActConstant.CURRENT_STATUS_USER_FINISHED;
         }
+        // 活动的状态是：finished ，显示：已结束
+        return ActConstant.CURRENT_STATUS_USER_FINISHED;
     }
 
     /**
@@ -326,8 +326,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return ActConstant.CURRENT_STATUS_USER_POINTS_CONFIRM;
         }
 
-        if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            /* 活动开始-结束的时间段内 */
+        if (currentTime.after(actInfoEntity.getActStartTime())) {
+            /* 活动开始后 */
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
         } else if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
             /* 报名截至时间前 */