活动详情，增加返回字段-用户是否已报名活动

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;
 }

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);
 }

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)

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>