diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java index 9e8b86eb2..bbd6463f9 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java @@ -103,4 +103,14 @@ public interface ActInfoDao extends BaseDao { * @Date 2020/2/8 13:08 **/ void addClockNum(String actId); + + + /*** + * 报名审核不通过 活动报名数-1 + * @param + * @return void + * @author qushutong + * @date 2020/4/3 9:25 + */ + void minusSignUpNum(String actId); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 47a4e35d2..09b6563f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -176,4 +176,13 @@ public interface ActInfoService extends BaseService { * @Date 2020/2/8 13:07 **/ void addClockNum(String actId); + + /*** + * 报名审核不通过 报名数-1 + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/4/3 9:23 + */ + void minusSignUpNum(String actId); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 86a05a776..bc0fdf529 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -89,6 +89,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -240,6 +243,11 @@ public class ActInfoServiceImpl extends BaseServiceImpl getDetailByApp(ActInfoAppFormDTO formDto) { @@ -261,7 +269,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl queryActInfoDetail(ActInfoAppFormDTO formDto) { ActInfoDetailResultDTO detailResultDTO = baseDao.selectActInfoDetailResultDTO(formDto.getId()); + // 获取用户报名状态 String currentUserStatus = getCurrentUserStatus(formDto.getId(), formDto.getUserId()); + detailResultDTO.setCurrentUserStatus(currentUserStatus); Result userVolunteerFlagResult = userInfoFeignClient.queryUserVolunteerFlag(formDto.getUserId()); detailResultDTO.setUserVolunteerFlag(userVolunteerFlagResult.getData()); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java index 3a5cb6e69..7d34dac49 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java @@ -176,6 +176,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl + + + + update epdc_act_info eai + set eai.SIGNUP_NUM=eai.SIGNUP_NUM-1 + where eai.DEL_FLAG='0' + and eai.id=#{actId} +