diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingActUserResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingActUserResultDTO.java index c40e1310b2..1993b73dfa 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingActUserResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/AuditingActUserResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result.work; +import com.epmet.commons.tools.constant.NumConstant; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +16,10 @@ import java.util.Date; @Data public class AuditingActUserResultDTO implements Serializable { private static final long serialVersionUID = 5567556309702585031L; + /** + * act_user_relation主键 + */ + private String actUserRelationId; /** * 活动id @@ -52,4 +57,10 @@ public class AuditingActUserResultDTO implements Serializable { */ private Boolean volunteerFlag; + public AuditingActUserResultDTO(){ + //微信基本信息先默认为空字符串 + this.setRealName(NumConstant.EMPTY_STR); + this.setNickName(NumConstant.EMPTY_STR); + this.setHeadImgUrl(NumConstant.EMPTY_STR); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActUserResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActUserResultDTO.java new file mode 100644 index 0000000000..c35ec60a4c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActUserResultDTO.java @@ -0,0 +1,78 @@ +package com.epmet.dto.result.work; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 报名审核-已取消报名列表 返参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/22 16:24 + */ +@Data +public class CanceledActUserResultDTO implements Serializable { + private static final long serialVersionUID = 2860252989602238156L; + + /** + * act_user_relation主键 + */ + private String actUserRelationId; + + /** + * 活动id + */ + private String actId; + + /** + * 用户id + */ + private String userId; + + /** + * 姓名 + */ + private String realName; + + /** + * 微信昵称 + */ + private String nickName; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 报名时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date signUpTime; + + /** + * true: 是志愿者 false : 不是志愿者 + */ + private Boolean volunteerFlag; + + /** + * 取消报名的时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date cancelTime; + + /** + * 用户取消报名的原因 + */ + private String cancelReason; + + public CanceledActUserResultDTO(){ + //微信基本信息先默认为空字符串 + this.setRealName(NumConstant.EMPTY_STR); + this.setNickName(NumConstant.EMPTY_STR); + this.setHeadImgUrl(NumConstant.EMPTY_STR); + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PassedActUserResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PassedActUserResultDTO.java new file mode 100644 index 0000000000..52f8d2469b --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PassedActUserResultDTO.java @@ -0,0 +1,72 @@ +package com.epmet.dto.result.work; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 报名审核-已通过列表返参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/22 15:12 + */ +@Data +public class PassedActUserResultDTO implements Serializable { + private static final long serialVersionUID = -3805973537303081543L; + /** + * act_user_relation主键 + */ + private String actUserRelationId; + + /** + * 活动id + */ + private String actId; + + /** + * 用户id + */ + private String userId; + + /** + * 姓名 + */ + private String realName; + + /** + * 微信昵称 + */ + private String nickName; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 报名时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date signUpTime; + + /** + * true: 是志愿者 false : 不是志愿者 + */ + private Boolean volunteerFlag; + + /** + * 审核通过的时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date auditTime; + + public PassedActUserResultDTO(){ + //微信基本信息先默认为空字符串 + this.setRealName(NumConstant.EMPTY_STR); + this.setNickName(NumConstant.EMPTY_STR); + this.setHeadImgUrl(NumConstant.EMPTY_STR); + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/RejectedActUserResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/RejectedActUserResultDTO.java new file mode 100644 index 0000000000..58d5f5c1cb --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/RejectedActUserResultDTO.java @@ -0,0 +1,77 @@ +package com.epmet.dto.result.work; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 报名审核-已拒绝列表 返参 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/22 15:41 + */ +@Data +public class RejectedActUserResultDTO implements Serializable { + private static final long serialVersionUID = 2569855003833546409L; + /** + * act_user_relation主键 + */ + private String actUserRelationId; + + /** + * 活动id + */ + private String actId; + + /** + * 用户id + */ + private String userId; + + /** + * 姓名 + */ + private String realName; + + /** + * 微信昵称 + */ + private String nickName; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 报名时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date signUpTime; + + /** + * true: 是志愿者 false : 不是志愿者 + */ + private Boolean volunteerFlag; + + /** + * 审核不通过的时间yyyy-MM-dd HH:mm:ss + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date auditTime; + + /** + * 未通过原因 + */ + private String failureReason; + + public RejectedActUserResultDTO(){ + //微信基本信息先默认为空字符串 + this.setRealName(NumConstant.EMPTY_STR); + this.setNickName(NumConstant.EMPTY_STR); + this.setHeadImgUrl(NumConstant.EMPTY_STR); + } +} 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 514a73f1e4..f770e5da75 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 @@ -4,6 +4,9 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.work.AuditingActUserFormDTO; import com.epmet.dto.result.work.AuditingActUserResultDTO; +import com.epmet.dto.result.work.CanceledActUserResultDTO; +import com.epmet.dto.result.work.PassedActUserResultDTO; +import com.epmet.dto.result.work.RejectedActUserResultDTO; import com.epmet.service.WorkActUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -39,4 +42,47 @@ public class WorkActUserController { List list=workActUserService.getAuditingList(formDTO); return new Result>().ok(list); } + + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param formDTO + * @author yinzuomei + * @description 报名审核-已通过列表 + * @Date 2020/7/22 15:16 + **/ + @PostMapping("passedlist") + public Result> getPassedList(@RequestBody AuditingActUserFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + List list=workActUserService.getPassedList(formDTO); + return new Result>().ok(list); + } + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param formDTO + * @author yinzuomei + * @description 报名审核-已拒绝列表 + * @Date 2020/7/22 15:49 + **/ + @PostMapping("rejectedlist") + public Result> getRejectedlist(@RequestBody AuditingActUserFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + List list=workActUserService.getRejectedlist(formDTO); + return new Result>().ok(list); + } + + /** + * @return + * @param formDTO + * @author yinzuomei + * @description 报名审核-已取消报名列表 + * @Date 2020/7/22 16:23 + **/ + @PostMapping("/heart/work/actuser/canceledlist") + public Result getCanceledList(@RequestBody AuditingActUserFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + List list=workActUserService.getCanceledList(formDTO); + return new Result>().ok(list); + } } 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 4054f2dda7..1aa248d4d3 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 @@ -50,4 +50,40 @@ public interface ActUserRelationDao extends BaseDao { * @Date 2020/7/21 22:45 **/ List selectAuditingUserIds(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 根据活动id，查询已通过人员关系记录 + * @Date 2020/7/22 15:33 + **/ + List selectPassedList(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 根据活动id，查询已通过人员,返回用户id集合 + * @Date 2020/7/22 15:38 + **/ + List selectPassedListUserIds(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 根据活动id，查询已拒绝人员关系记录 + * @Date 2020/7/22 16:20 + **/ + List selectRejectedList(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 根据活动id，查询已拒绝人员,返回用户id集合 + * @Date 2020/7/22 16:20 + **/ + List selectRejectedListUserIds(String actId); } \ No newline at end of file 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 f0d0fe7d5b..c96dcb9d94 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 @@ -110,4 +110,40 @@ public interface ActUserRelationService extends BaseService getAuditingUserIds(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 查询已通过的人员列表 + * @Date 2020/7/22 15:31 + **/ + List getPassedList(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 查询已通过的人员列表 userId集合 + * @Date 2020/7/22 15:37 + **/ + List getPassedListUserIds(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 查询已拒绝过的人员列表 + * @Date 2020/7/22 16:19 + **/ + List getRejectedList(String actId); + + /** + * @return java.util.List + * @param actId + * @author yinzuomei + * @description 查询已拒绝的人员列表 userId集合 + * @Date 2020/7/22 16:19 + **/ + List getRejectedListUserIds(String actId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java index a11d56794d..c319566125 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java @@ -2,6 +2,9 @@ package com.epmet.service; import com.epmet.dto.form.work.AuditingActUserFormDTO; import com.epmet.dto.result.work.AuditingActUserResultDTO; +import com.epmet.dto.result.work.CanceledActUserResultDTO; +import com.epmet.dto.result.work.PassedActUserResultDTO; +import com.epmet.dto.result.work.RejectedActUserResultDTO; import java.util.List; @@ -20,4 +23,31 @@ public interface WorkActUserService { * @Date 2020/7/21 22:25 **/ List getAuditingList(AuditingActUserFormDTO formDTO); + + /** + * @return java.util.List + * @param formDTO + * @author yinzuomei + * @description 报名审核-已通过列表 + * @Date 2020/7/22 15:16 + **/ + List getPassedList(AuditingActUserFormDTO formDTO); + + /** + * @return java.util.List + * @param formDTO + * @author yinzuomei + * @description 报名审核-已拒绝列表 + * @Date 2020/7/22 15:50 + **/ + List getRejectedlist(AuditingActUserFormDTO formDTO); + + /** + * @return java.util.List + * @param formDTO + * @author yinzuomei + * @description 报名审核-已取消报名列表 + * @Date 2020/7/22 16:35 + **/ + List getCanceledList(AuditingActUserFormDTO formDTO); } 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 0979dc568d..516b0fa31d 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 @@ -125,4 +125,52 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl + * @author yinzuomei + * @description 查询已通过的人员列表 + * @Date 2020/7/22 15:31 + **/ + @Override + public List getPassedList(String actId) { + return baseDao.selectPassedList(actId); + } + + /** + * @param actId + * @return java.util.List + * @author yinzuomei + * @description 查询已通过的人员列表 userId集合 + * @Date 2020/7/22 15:37 + **/ + @Override + public List getPassedListUserIds(String actId) { + return baseDao.selectPassedListUserIds(actId); + } + + /** + * @param actId + * @return java.util.List + * @author yinzuomei + * @description 查询已拒绝过的人员列表 + * @Date 2020/7/22 16:19 + **/ + @Override + public List getRejectedList(String actId) { + return baseDao.selectRejectedList(actId); + } + + /** + * @param actId + * @return java.util.List + * @author yinzuomei + * @description 查询已拒绝的人员列表 userId集合 + * @Date 2020/7/22 16:19 + **/ + @Override + public List getRejectedListUserIds(String actId) { + return baseDao.selectRejectedListUserIds(actId); + } + } \ No newline at end of file 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 9e7cac148d..bb4d0c546e 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 @@ -1,12 +1,14 @@ package com.epmet.service.impl; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ActUserRelationDTO; import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.form.work.AuditingActUserFormDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.work.AuditingActUserResultDTO; +import com.epmet.dto.result.work.CanceledActUserResultDTO; +import com.epmet.dto.result.work.PassedActUserResultDTO; +import com.epmet.dto.result.work.RejectedActUserResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.ActUserRelationService; import com.epmet.service.HeartUserInfoService; @@ -48,43 +50,173 @@ public class WorkActUserServiceImpl implements WorkActUserService { //查询出待审核的人员列表 List actUserRelationDTOList=actUserRelationService.getAuditingUserList(formDTO.getActId()); if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){ - logger.info(String.format("当前活动%s没有待审核的报名人员",formDTO.getActId())); + logger.info(String.format("当前活动,actId=%s待审核列表为空",formDTO.getActId())); return list; } //查询出待审核的人员id集合 List userIdList=actUserRelationService.getAuditingUserIds(formDTO.getActId()); - //根据待审核的人员结合，查询出用户基本信息 + //根据待审核的人员集合，查询出用户基本信息 List userInfoList=this.queryUserBaseInfo(userIdList); - //调用epemet_user服务获取用户的基本信息 for(ActUserRelationDTO actUserRelationDTO:actUserRelationDTOList){ - AuditingActUserResultDTO resultDTO=new AuditingActUserResultDTO(); - resultDTO.setActId(formDTO.getActId()); - resultDTO.setUserId(actUserRelationDTO.getUserId()); - resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); - //微信基本信息先默认为空字符串 - resultDTO.setRealName(NumConstant.EMPTY_STR); - resultDTO.setNickName(NumConstant.EMPTY_STR); - resultDTO.setHeadImgUrl(NumConstant.EMPTY_STR); + AuditingActUserResultDTO auditingDTO=new AuditingActUserResultDTO(); + auditingDTO.setActUserRelationId(actUserRelationDTO.getId()); + auditingDTO.setActId(formDTO.getActId()); + auditingDTO.setUserId(actUserRelationDTO.getUserId()); + auditingDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); + //true: 是志愿者 false : 不是志愿者 + auditingDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId())); + //赋值基本信息 + for(UserBaseInfoResultDTO userBaseInfoResultDTO:userInfoList){ + if(actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())){ + auditingDTO.setRealName(userBaseInfoResultDTO.getRealName()); + auditingDTO.setNickName(userBaseInfoResultDTO.getNickname()); + auditingDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); + break; + } + } + list.add(auditingDTO); + } + return list; + } - HeartUserInfoDTO heartUserInfoDTO=heartUserInfoService.getByUserId(actUserRelationDTO.getUserId()); + /** + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @description 报名审核-已通过列表 + * @Date 2020/7/22 15:16 + **/ + @Override + public List getPassedList(AuditingActUserFormDTO formDTO) { + List resultList=new ArrayList<>(); + //查询已通过的人员列表 + List actUserRelationDTOList=actUserRelationService.getPassedList(formDTO.getActId()); + if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){ + logger.info(String.format("当前活动,actId=%s已通过列表为空",formDTO.getActId())); + return resultList; + } + //查询已通过审核的人员id集合 + List userIdList=actUserRelationService.getPassedListUserIds(formDTO.getActId()); + //根据已通过的人员集合，查询出用户基本信息 + List userInfoList=this.queryUserBaseInfo(userIdList); + for(ActUserRelationDTO actUserRelationDTO:actUserRelationDTOList){ + PassedActUserResultDTO passedDTO=new PassedActUserResultDTO(); + passedDTO.setActUserRelationId(actUserRelationDTO.getId()); + passedDTO.setActId(formDTO.getActId()); + passedDTO.setUserId(actUserRelationDTO.getUserId()); + passedDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); + passedDTO.setAuditTime(actUserRelationDTO.getAuditTime()); + //true: 是志愿者 false : 不是志愿者 + passedDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId())); + //赋值基本信息 + for(UserBaseInfoResultDTO userBaseInfoResultDTO:userInfoList){ + if(actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())){ + passedDTO.setRealName(userBaseInfoResultDTO.getRealName()); + passedDTO.setNickName(userBaseInfoResultDTO.getNickname()); + passedDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); + break; + } + } + resultList.add(passedDTO); + } + return resultList; + } + + /** + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @description 报名审核-已拒绝列表 + * @Date 2020/7/22 15:50 + **/ + @Override + public List getRejectedlist(AuditingActUserFormDTO formDTO) { + List resultList=new ArrayList<>(); + //查询已拒绝的人员列表 + List actUserRelationDTOList=actUserRelationService.getRejectedList(formDTO.getActId()); + if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){ + logger.info(String.format("当前活动,actId=%s已拒绝列表为空",formDTO.getActId())); + return resultList; + } + //查询已拒绝审核的人员id集合 + List userIdList=actUserRelationService.getRejectedListUserIds(formDTO.getActId()); + //根据已拒绝的人员集合，查询出用户基本信息 + List userInfoList=this.queryUserBaseInfo(userIdList); + for(ActUserRelationDTO actUserRelationDTO:actUserRelationDTOList){ + RejectedActUserResultDTO rejectedDTO=new RejectedActUserResultDTO(); + rejectedDTO.setActUserRelationId(actUserRelationDTO.getId()); + rejectedDTO.setActId(formDTO.getActId()); + rejectedDTO.setUserId(actUserRelationDTO.getUserId()); + rejectedDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); + rejectedDTO.setAuditTime(actUserRelationDTO.getAuditTime()); + rejectedDTO.setFailureReason(actUserRelationDTO.getFailureReason()); //true: 是志愿者 false : 不是志愿者 - if(null!=heartUserInfoDTO){ - resultDTO.setVolunteerFlag(heartUserInfoDTO.getVolunteerFlag()); - }else{ - resultDTO.setVolunteerFlag(false); + rejectedDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId())); + //赋值基本信息 + for(UserBaseInfoResultDTO userBaseInfoResultDTO:userInfoList){ + if(actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())){ + rejectedDTO.setRealName(userBaseInfoResultDTO.getRealName()); + rejectedDTO.setNickName(userBaseInfoResultDTO.getNickname()); + rejectedDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); + break; + } } + resultList.add(rejectedDTO); + } + return resultList; + } + + /** + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @description 报名审核-已取消报名列表 + * @Date 2020/7/22 16:35 + **/ + @Override + public List getCanceledList(AuditingActUserFormDTO formDTO) { + List resultList=new ArrayList<>(); + //查询已取消的人员列表 + List actUserRelationDTOList=actUserRelationService.getRejectedList(formDTO.getActId()); + if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){ + logger.info(String.format("当前活动,actId=%s已取消报名列表为空",formDTO.getActId())); + return resultList; + } + //查询已取消审核的人员id集合 + List userIdList=actUserRelationService.getRejectedListUserIds(formDTO.getActId()); + //根据已取消的人员集合，查询出用户基本信息 + List userInfoList=this.queryUserBaseInfo(userIdList); + for(ActUserRelationDTO actUserRelationDTO:actUserRelationDTOList){ + CanceledActUserResultDTO cancelDTO=new CanceledActUserResultDTO(); + cancelDTO.setActUserRelationId(actUserRelationDTO.getId()); + cancelDTO.setActId(formDTO.getActId()); + cancelDTO.setUserId(actUserRelationDTO.getUserId()); + cancelDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); + cancelDTO.setCancelReason(actUserRelationDTO.getCancelReason()); + cancelDTO.setCancelTime(actUserRelationDTO.getCancelTime()); + //true: 是志愿者 false : 不是志愿者 + cancelDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId())); //赋值基本信息 for(UserBaseInfoResultDTO userBaseInfoResultDTO:userInfoList){ if(actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())){ - resultDTO.setRealName(userBaseInfoResultDTO.getRealName()); - resultDTO.setNickName(userBaseInfoResultDTO.getNickname()); - resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); + cancelDTO.setRealName(userBaseInfoResultDTO.getRealName()); + cancelDTO.setNickName(userBaseInfoResultDTO.getNickname()); + cancelDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl()); break; } } - list.add(resultDTO); + resultList.add(cancelDTO); } - return list; + return resultList; + } + + private Boolean getVolunteerFlag(String userId) { + HeartUserInfoDTO heartUserInfoDTO=heartUserInfoService.getByUserId(userId); + //true: 是志愿者 false : 不是志愿者 + if(null!=heartUserInfoDTO){ + return heartUserInfoDTO.getVolunteerFlag(); + } + return false; } /** @@ -99,6 +231,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { if(null==userIdList||userIdList.size()==0){ return userInfoList; } + //调用epemet_user服务获取用户的基本信息 Result> resultUserList =epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); if(resultUserList.success()&&resultUserList.getData().size()>0){ return resultUserList.getData(); 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 7dcd874931..17beff7a83 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 @@ -50,4 +50,54 @@ AND aur.ACT_ID = #{actId} order by aur.CREATED_TIME desc + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java index 19ece1b40f..983bffec24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -13,6 +14,8 @@ import java.io.Serializable; @Data public class UserBaseInfoResultDTO implements Serializable { private static final long serialVersionUID = 3124057264557384333L; + @JsonIgnore + private String id; /** * 用户id */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBaseInfoEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBaseInfoEntity.java index 882aaeb243..9a20ef3395 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBaseInfoEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBaseInfoEntity.java @@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; + /** * 用户基础信息 * @@ -35,29 +36,25 @@ public class UserBaseInfoEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; - /** - * 主键 - */ - private String id; - /** - * 用户id - */ + /** + * 用户id + */ private String userId; - /** - * 手机号(注册手机号) - */ + /** + * 手机号(注册手机号) + */ private String mobile; - /** - * 姓氏 - */ + /** + * 姓氏 + */ private String surname; - /** - * 名称 - */ + /** + * 名称 + */ private String name; /** @@ -65,39 +62,39 @@ public class UserBaseInfoEntity extends BaseEpmetEntity { */ private String realName; - /** - * 身份证号 - */ + /** + * 身份证号 + */ private String idNum; - /** - * 性别（1男2女0未知） - */ + /** + * 性别（1男2女0未知） + */ private String gender; - /** - * 街道 - */ + /** + * 街道 + */ private String street; - /** - * 小区名称 - */ + /** + * 小区名称 + */ private String district; - /** - * 楼栋单元 - */ + /** + * 楼栋单元 + */ private String buildingAddress; - /** - * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称) - */ + /** + * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称) + */ private String nickname; - /** - * 头像（目前来源于微信，后续系统顾客支持上传头像） - */ + /** + * 头像（目前来源于微信，后续系统顾客支持上传头像） + */ private String headImgUrl; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index ea1abcfa50..f097d83000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -161,15 +161,24 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl - + @@ -22,11 +22,13 @@ +