From 47c5ecb8f512c1aa51ba09aa9095a08c67cbfe49 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 24 Sep 2021 14:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4=E6=AE=B5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcAppActUserCancelsignupDTO.java | 8 +++++ .../activity/dao/ActPeriodUserDao.java | 10 ++++++ .../service/ActPeriodUserService.java | 10 ++++++ .../impl/ActPeriodUserServiceImpl.java | 5 +++ .../impl/ActUserRelationServiceImpl.java | 4 +-- .../mapper/activity/ActPeriodUserDao.xml | 32 +++++++++++++++++-- 6 files changed, 65 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java index fee9ec4f..67c7d879 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java @@ -21,7 +21,9 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * 取消报名参数 @@ -50,4 +52,10 @@ public class EpdcAppActUserCancelsignupDTO implements Serializable { @NotBlank(message = "取消报名原因不能为空") @Length(max = 150, message = "取消报名原因不能超过150字") private String failureReason; + + /** + * 活动详细时间段表ID + */ + @NotNull(message = "活动时间段ID不能为空") + private List actPeriodId; } 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 ad775384..ae656169 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 @@ -45,6 +45,16 @@ 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 f3e2a39d..9d0fc27c 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 @@ -104,6 +104,16 @@ 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 bb70797b..400ad5ab 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 @@ -102,6 +102,11 @@ 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 4f9c8360..109cfd47 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 @@ -333,8 +333,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl periodTime = actPeriodUserService.listOfSignInActPeriodsByActUserRelationId(actUserRelationEntity.getId()); + // 查询状态为：已报名的所有时间段 + List periodTime = actPeriodUserService.listOfNormalSignInActPeriodsByActUserRelationId1(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 63f2fb60..10f48d87 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 @@ -26,13 +26,41 @@ WHERE ur.ID = #{actUserRelationId} ) t - LEFT JOIN epdc_act_period_user pu ON pu.ACT_USER_RELATION_ID = t.ID AND pu.PERIOD_STATUS NOT IN ('3','4') + LEFT JOIN epdc_act_period_user pu ON pu.ACT_USER_RELATION_ID = t.ID 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 + + update epdc_act_period_user set del_flag = '1' where ACT_USER_RELATION_ID = #{actUserRelationId} @@ -44,7 +72,7 @@ FAILURE_REASON = #{item.failureReason}, - PERIOD_STATUS = #{periodStatus} + PERIOD_STATUS = #{item.periodStatus}, UPDATED_TIME = NOW() WHERE ACT_USER_RELATION_ID = #{item.actUserRelationId} AND ACT_PERIOD_ID = #{item.actPeriodId}