From 7fc075eb5cd5451dfad55146fcd9178338c1358d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 15:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=9A=E5=B7=B2?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkActUserController.java | 18 +++++++++--------- .../java/com/epmet/dao/ActUserRelationDao.java | 9 +++++++++ .../epmet/service/ActUserRelationService.java | 9 +++++++++ .../impl/ActUserRelationServiceImpl.java | 5 +++++ .../service/impl/WorkActUserServiceImpl.java | 4 ++-- .../resources/mapper/ActUserRelationDao.xml | 13 +++++++++++++ 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java index 59769d69b9..5e421381a3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java @@ -25,13 +25,13 @@ public class WorkActUserController { @Autowired private WorkActUserService workActUserService; - + /** * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei * @description 报名审核-待审核列表 - * @Date 2020/7/21 22:24 + * @Date 2020/7/21 22:24 **/ @PostMapping("auditinglist") public Result> getAuditingList(@RequestBody ActIdFormDTO formDTO){ @@ -45,7 +45,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已通过列表 - * @Date 2020/7/22 15:16 + * @Date 2020/7/22 15:16 **/ @PostMapping("passedlist") public Result> getPassedList(@RequestBody ActIdFormDTO formDTO){ @@ -58,7 +58,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已拒绝列表 - * @Date 2020/7/22 15:49 + * @Date 2020/7/22 15:49 **/ @PostMapping("rejectedlist") public Result> getRejectedlist(@RequestBody ActIdFormDTO formDTO){ @@ -123,7 +123,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-审核通过 - * @Date 2020/7/23 17:31 + * @Date 2020/7/23 17:31 **/ @PostMapping("auditpass") public Result auditPass(@RequestBody AuditUserFormDTO formDTO){ @@ -137,7 +137,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-拒绝报名 - * @Date 2020/7/23 18:08 + * @Date 2020/7/23 18:08 **/ @PostMapping("auditrefuse") public Result auditrefuse(@RequestBody AuditUserFormDTO formDTO){ @@ -150,8 +150,8 @@ public class WorkActUserController { * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei - * @description 已结束-已参加人员列表 - * @Date 2020/7/24 10:17 + * @description 已结束-已参加人员列表(审核中、审核通过) + * @Date 2020/7/24 10:17 **/ @PostMapping("joinuserlist") public Result> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){ @@ -164,7 +164,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 已结束-已取消报名人员列表 - * @Date 2020/7/24 10:53 + * @Date 2020/7/24 10:53 **/ @PostMapping("canceleduserlist") public Result> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index 1322db3c83..a18f3ae5dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao { * @Date 15:59 2020-07-30 **/ String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java index 91ec9355da..1540926469 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java @@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index 7b25b31eab..935a5cd8a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -238,6 +238,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl getSignUpUserIdList(String actId) { + return baseDao.getSignUpUserIdList(actId); + } + /** * 开始报名活动 * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 3694611f3c..879213f11a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -529,8 +529,8 @@ public class WorkActUserServiceImpl implements WorkActUserService { } List list=actInfoDao.queryJoinUserList(formDTO.getActId()); if(null!=list&&list.size()>0){ - //查询已通过审核的人员id集合 - List userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED); + //查询已报名(审核中、审核通过)的人员id集合 + List userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId()); //根据已通过的人员集合，查询出用户基本信息 List userInfoList=this.queryUserBaseInfoList(userIdList); for(JoinedUserResultDTO joinedUserResultDTO:list){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 17fbb27e9a..f6f1e87c0d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -319,4 +319,17 @@ AND aur.USER_ID = #{userId} AND aur.ACT_ID = #{actId} + + +