diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActivityParticipantEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActivityParticipantEntity.java index 89aac97..78011a3 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActivityParticipantEntity.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActivityParticipantEntity.java @@ -88,11 +88,6 @@ public class ActivityParticipantEntity extends BaseEpdcEntity { */ private String identityNo; - /** - * 未通过原因(仅当未通过时录入,并读取) - */ - private String failureReason; - /** * 报名时间 */ diff --git a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml index 638fddc..88d6c8e 100644 --- a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml @@ -44,12 +44,11 @@ a.ACT_QUOTA_FLAG, a.ACT_QUOTA, a.SIGN_UP_NUM, - ( CASE WHEN p.id IS NOT NULL THEN '0' ELSE '1' END ) AS SIGN_UP_FLAG + ( CASE WHEN p.id IS NULL THEN '0' ELSE '1' END ) AS SIGN_UP_FLAG FROM epdc_activity_info a LEFT JOIN epdc_section_category s ON a.CATEGORY_CODE = s. CODE - LEFT JOIN epdc_activity_participant p ON a.ID = p.ACT_ID - AND p.USER_ID = #{userId} + LEFT JOIN epdc_activity_participant p ON a.ID = p.ACT_ID AND p.USER_ID = #{userId} AND p.DEL_FLAG = '0' WHERE a.DEL_FLAG = '0' AND a.ACT_STATUS = '1'