From 2444e10d078fb37ceb0cf666550d060f5f26f406 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 11 Sep 2020 09:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=89=93=E5=8D=A1=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/resi/ResiActDetailResultDTO.java      |  8 ++++++--
 .../com/epmet/service/impl/ActInfoServiceImpl.java   | 12 +++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
index 312d36843e..0f5033e02a 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
@@ -139,9 +139,13 @@ public class ResiActDetailResultDTO implements Serializable {
     private Boolean isSignUp;
 
     /**
-     * 用户是否已报名该活动  true用户已报名；false用户未报名
+     * 用户报名活动后，当前状态
+     * --（已报名/待审核auditing，
+     * -- 审核通过passed，
+     * -- 未报名(审核不通过 或 取消报名)canceled，
+     * -- ）
      */
-    private Boolean isRegistration;
+    private String isRegistration;
 
     /**
      * 打卡开始时间（yyyy-MM-dd HH:mm）
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 9f3649d421..4f539675fb 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
@@ -221,12 +221,18 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
 
         // 查询用户是否已报名活动
         String status = actUserRelationDao.selectUserStatusByActIdAndUserId(formDto.getActId(), formDto.getUserId());
-        detailResultDTO.setIsRegistration(false);
+        // 默认用户 未报名活动
+        detailResultDTO.setIsRegistration(ActConstant.ACT_USER_LOG_OPER_CANCELD);
         if (null != status){
-            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status) || ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
-                detailResultDTO.setIsRegistration(true);
+            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status)){
+                // 用户报名活动审核通过，赋值 审核通过
+                detailResultDTO.setIsRegistration(status);
+            } else if ( ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
+                // 用户报名活动未审核，赋值 已报名/待审核
+                detailResultDTO.setIsRegistration(status);
             }
         }
+
         // 获取用户报名状态
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());
         detailResultDTO.setCurrentUserStatus(currentUserStatus);