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 { * @Date 2020/7/27 14:59 **/ List 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 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} + + +