diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index 50ff1d960..95a452f7d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -282,7 +282,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             /*活动结束-打卡截止时间
             1、当前用户未报名 显示一结束
             2、当前用户已报名（审核通过）未打卡的显示 我要打卡
-            3、当前用户已报名（已经打过卡的）显示更新打卡*/
+            3、当前用户已报名（已经打过卡的）显示更新打卡
+            4、当前用户已经报名（未审核的、审核未通过、已经取消报名的）-已结束*/
             if (null == actUserRelationEntity) {
                 currentUserStatus = ActUserStatusConstant.FINISHED;
             } else if (null != actUserRelationEntity
@@ -293,12 +294,17 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     && ActUserRelationStatusConstant.CLOCK.equals(actUserRelationEntity.getStatus())
                     && CollUtil.isNotEmpty(actUserClockLogList)) {
                 currentUserStatus = ActUserStatusConstant.UPDATE_CLOCK;
+            } else if (null != actUserRelationEntity && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus())
+                    || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())
+                    || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()))) {
+                currentUserStatus = ActUserStatusConstant.FINISHED;
             }
         } else if (currentTime.after(actInfoEntity.getSigninStartTime()) && currentTime.before(actInfoEntity.getSigninEndTime())) {
             /*活动打卡时间段内：
             1、当前用户未报名 不显示:进行中
             2、当前用户已报名且未打卡  我要打卡
-            3、当前用户已报名且已打卡  更新打卡*/
+            3、当前用户已报名且已打卡  更新打卡
+            4、当前用户报名未审核、取消报名、或者审核不通过的-显示进行中*/
             if (null == actUserRelationEntity) {
                 currentUserStatus = ActUserStatusConstant.ON_GOING;
             } else if (null != actUserRelationEntity
@@ -309,13 +315,18 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     && ActUserRelationStatusConstant.CLOCK.equals(actUserRelationEntity.getStatus())
                     && CollUtil.isNotEmpty(actUserClockLogList)) {
                 currentUserStatus = ActUserStatusConstant.UPDATE_CLOCK;
+            } else if (null != actUserRelationEntity
+                    && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus())
+                    || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())
+                    || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) {
+                currentUserStatus = ActUserStatusConstant.ON_GOING;
             }
         } else if (currentTime.before(actInfoEntity.getSignupEndTime())) {
             /*报名截至时间前：
             1、当前用户未报名底部显示按钮  我要报名
             2、当前用户未报名且活动名额已满底部显示按钮  已报满
-            3、当前用户已报名底部显示按钮  取消报名
-            4、当前用户已经取消报名的可再次报名-我要报名*/
+            3、当前用户已报名（未审核、审核通过的）底部显示按钮  取消报名
+            4、当前用户（报名审核未通过或者已经取消报名的）可再次报名-我要报名*/
             if (null == actUserRelationEntity && (actInfoEntity.getActQuota() > actInfoEntity.getSignupNum())) {
                 currentUserStatus = ActUserStatusConstant.SIGN_UP;
             } else if (null == actUserRelationEntity && (actInfoEntity.getActQuota().equals(actInfoEntity.getSignupNum()))) {
@@ -324,7 +335,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus())
                     || ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()))) {
                 currentUserStatus = ActUserStatusConstant.CANCEL_SIGN_UP;
-            } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())) {
+            } else if (null != actUserRelationEntity
+                    && (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())
+                    || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()))) {
                 currentUserStatus = ActUserStatusConstant.SIGN_UP;
             }
         } else if (currentTime.after(actInfoEntity.getSignupEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) {