From b739b6e7c3049ab5851cf8d6c89d5dde1c87b4e4 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Tue, 21 Dec 2021 14:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B4=BB=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E5=AE=A1=E6=A0=B8=E6=8B=92=E7=BB=9D=E6=97=B6?= =?UTF-8?q?=E3=80=82=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activity/dao/ActPeriodDao.java | 11 ++++++++++ .../activity/service/ActPeriodService.java | 11 ++++++++++ .../service/impl/ActPeriodServiceImpl.java | 6 ++++++ .../impl/ActUserRelationServiceImpl.java | 3 ++- .../mapper/activity/ActPeriodDao.xml | 20 +++++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java index ebcfaf34..058cc001 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java @@ -95,4 +95,15 @@ public interface ActPeriodDao extends BaseDao { * @Date 14:29 2021-10-08 **/ void minusPeriodSignUpNum(@Param("periodIds") List periodIds); + + /** + * 获取该活动中，我报名的活动时间段 + * + * @param actId + * @param actUserRelationId + * @return java.util.List + * @author zy + * @since 2021/9/2 16:13 + */ + List selectListOfActPeriodsByActIdAndActUserRelationId(@Param("actId") String actId, @Param("actUserRelationId") String actUserRelationId); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java index 0fa7f904..32eae501 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java @@ -113,6 +113,17 @@ public interface ActPeriodService extends BaseService { */ List listOfActPeriodsByActId(String actId); + /** + * 获取该活动中，我报名的活动时间段 + * + * @param actId + * @param actUserRelationId + * @return java.util.List + * @author zy + * @since 2021/9/2 16:13 + */ + List listOfActPeriodsByActIdAndActUserRelationId(String actId, String actUserRelationId); + /** * 根据活动id，查询该活动存在几条活动时间段 * 如果是老数据，则为 0 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java index 0cdc48c3..61ccb812 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java @@ -122,6 +122,12 @@ public class ActPeriodServiceImpl extends BaseServiceImpl listOfActPeriodsByActIdAndActUserRelationId(String actId, String actUserRelationId) { + List data = baseDao.selectListOfActPeriodsByActIdAndActUserRelationId(actId, actUserRelationId); + return data; + } + @Override public Integer getPeriodNumberByActId(String actId) { return baseDao.getPeriodNumberByActId(actId); 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 e1f94bfb..62ffac4a 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 @@ -186,7 +186,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl signUpPeriodsByActId = actPeriodService.listOfActPeriodsByActId(entity.getActId()); + // 审核不通过，把我在这个活动中，报名的所有时间段都取消。 + List signUpPeriodsByActId = actPeriodService.listOfActPeriodsByActIdAndActUserRelationId(entity.getActId(), dto.getId()); List periodIds = new ArrayList<>(); for (ActPeriodDTO period : signUpPeriodsByActId) { periodIds.add(period.getId()); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml index 7cd13583..844dbc23 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml @@ -82,4 +82,24 @@ #{periodId} + +