From 26eb649f94551a1f0b5b58f62094a33e02609ea3 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Sun, 26 Sep 2021 15:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/dao/ActPeriodUserDao.java | 10 ------- .../service/ActPeriodUserService.java | 10 ------- .../impl/ActPeriodUserServiceImpl.java | 5 ---- .../impl/ActUserRelationServiceImpl.java | 2 +- .../mapper/activity/ActPeriodUserDao.xml | 29 +------------------ 5 files changed, 2 insertions(+), 54 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodUserDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodUserDao.java index 2f8d2109..1e313289 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodUserDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodUserDao.java @@ -47,16 +47,6 @@ public interface ActPeriodUserDao extends BaseDao { */ List selectListOfSignInActPeriodsByActUserRelationId(String actUserRelationId); - /** - * 获取用户报名时间段，且该时间段：未被取消、未被拒绝 - * - * @param actUserRelationId - * @return java.util.List - * @author lc - * @since 2021/9/2 20:05 - */ - List listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId); - /** * 删除参与活动时间段记录 * diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodUserService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodUserService.java index 27f3b560..1317e971 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodUserService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodUserService.java @@ -105,16 +105,6 @@ public interface ActPeriodUserService extends BaseService { */ List listOfSignInActPeriodsByActUserRelationId(String actUserRelationId); - /** - * 获取用户报名时间段，且该时间段：未被取消、未被拒绝 - * - * @param actUserRelationId - * @return java.util.List - * @author lc - * @since 2021/9/2 20:05 - */ - List listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId); - /** * 删除参与活动时间段记录 * diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodUserServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodUserServiceImpl.java index f0843f36..bbf50f5d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodUserServiceImpl.java @@ -103,11 +103,6 @@ public class ActPeriodUserServiceImpl extends BaseServiceImpl listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId) { - return baseDao.listOfNormalSignInActPeriodsByActUserRelationId1(actUserRelationId); - } - @Override @Transactional(rollbackFor = Exception.class) public void removeActPeriodUserByActUserRelationId(String actUserRelationId) { 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 49eaf0cd..8f58ac97 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 @@ -337,7 +337,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl periodTime = actPeriodUserService.listOfNormalSignInActPeriodsByActUserRelationId1(actUserRelationEntity.getId()); + List periodTime = actPeriodUserService.listOfSignInActPeriodsByActUserRelationId(actUserRelationEntity.getId()); if (null == periodTime) { periodTime = new ArrayList<>(); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodUserDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodUserDao.xml index 330192da..e38bbe50 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodUserDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodUserDao.xml @@ -30,34 +30,7 @@ AND pu.DEL_FLAG = '0' LEFT JOIN epdc_act_period p ON p.ID = pu.ACT_PERIOD_ID AND p.DEL_FLAG = '0' - ORDER BY actPeriodStartTime - - -