From 86d164dbc8c1a70a6e2c7ff88d311285332cec38 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 30 Jul 2020 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E5=B7=B2=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/resi/ResiActDetailResultDTO.java      |  5 +++++
 .../main/java/com/epmet/dao/ActUserRelationDao.java  | 11 +++++++++++
 .../com/epmet/service/impl/ActInfoServiceImpl.java   | 10 +++++++++-
 .../src/main/resources/mapper/ActUserRelationDao.xml | 12 ++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

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 18dba0c301..fe8ef51b45 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
@@ -137,4 +137,9 @@ public class ResiActDetailResultDTO implements Serializable {
      * 是否已签到(true已签到，false未签到)
      */
     private Boolean isSignUp;
+
+    /**
+     * 用户是否已报名该活动  true用户已报名；false用户未报名
+     */
+    private Boolean isRegistration;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java
index b60d5f9b4a..7b97d6cf80 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java
@@ -206,4 +206,15 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @Date 2020/7/27 14:59
      **/
     List<ActUserRelationDTO> selectAuditingAndPassedList(String actId);
+
+    /**
+     * 查询当前用户与活动之间的状态
+     *
+     * @param actId
+     * @param userId
+     * @return java.lang.String
+     * @Author zhangyong
+     * @Date 15:59 2020-07-30
+     **/
+    String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId);
 }
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 a7a058164f..2470f86c76 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
@@ -222,6 +222,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         Boolean volunteerFlag = heartUserInfoDao.selectUserVolunteerFlag(formDto.getUserId());
         detailResultDTO.setUserVolunteerFlag(volunteerFlag);
 
+        // 查询用户是否已报名活动
+        String status = actUserRelationDao.selectUserStatusByActIdAndUserId(formDto.getActId(), formDto.getUserId());
+        detailResultDTO.setIsRegistration(false);
+        if (null != status){
+            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status) || ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
+                detailResultDTO.setIsRegistration(true);
+            }
+        }
         // 获取用户报名状态
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());
         detailResultDTO.setCurrentUserStatus(currentUserStatus);
@@ -250,7 +258,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return ActConstant.CURRENT_STATUS_USER_FINISHED;
         }
 
-        // 查询用户是否报名该活动
+        // 查询用户是否报名参加过该活动
         QueryWrapper<ActUserRelationEntity> actUserRelationWrapper = new QueryWrapper<>();
         actUserRelationWrapper.eq("ACT_ID", actId)
                 .eq("USER_ID", userId)
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
index 6d53c1f139..edf2f0252d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
@@ -303,4 +303,16 @@
             AND ( aur.STATUS = 'auditing' OR aur.`STATUS` = 'passed' )
             AND aur.ACT_ID = #{actId}
     </select>
+
+    <!-- 当前用户的状态 -->
+    <select id="selectUserStatusByActIdAndUserId" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            aur.STATUS
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.USER_ID = #{userId}
+            AND aur.ACT_ID = #{actId}
+    </select>
 </mapper>