heart-work:报名审核tab列表初始

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);
+    }
 }

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);
+    }
+}

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);
+    }
+}

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);
+    }
+}

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<AuditingActUserResultDTO> list=workActUserService.getAuditingList(formDTO);
         return new Result<List<AuditingActUserResultDTO>>().ok(list);
     }
+
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.PassedActUserResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 报名审核-已通过列表
+     * @Date 2020/7/22 15:16 
+     **/
+    @PostMapping("passedlist")
+    public Result<List<PassedActUserResultDTO>> getPassedList(@RequestBody AuditingActUserFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class);
+        List<PassedActUserResultDTO> list=workActUserService.getPassedList(formDTO);
+        return new Result<List<PassedActUserResultDTO>>().ok(list);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.RejectedActUserResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 报名审核-已拒绝列表
+     * @Date 2020/7/22 15:49 
+     **/
+    @PostMapping("rejectedlist")
+    public Result<List<RejectedActUserResultDTO>> getRejectedlist(@RequestBody AuditingActUserFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class);
+        List<RejectedActUserResultDTO> list=workActUserService.getRejectedlist(formDTO);
+        return new Result<List<RejectedActUserResultDTO>>().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<CanceledActUserResultDTO> list=workActUserService.getCanceledList(formDTO);
+        return new Result<List<CanceledActUserResultDTO>>().ok(list);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -50,4 +50,40 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @Date 2020/7/21 22:45
      **/
     List<String> selectAuditingUserIds(String actId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @param actId
+     * @author yinzuomei
+     * @description 根据活动id，查询已通过人员关系记录
+     * @Date 2020/7/22 15:33
+     **/
+    List<ActUserRelationDTO> selectPassedList(String actId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author yinzuomei
+     * @description 根据活动id，查询已通过人员,返回用户id集合
+     * @Date 2020/7/22 15:38
+     **/
+    List<String> selectPassedListUserIds(String actId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @param actId
+     * @author yinzuomei
+     * @description 根据活动id，查询已拒绝人员关系记录
+     * @Date 2020/7/22 16:20
+     **/
+    List<ActUserRelationDTO> selectRejectedList(String actId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author yinzuomei
+     * @description 根据活动id，查询已拒绝人员,返回用户id集合
+     * @Date 2020/7/22 16:20
+     **/
+    List<String> selectRejectedListUserIds(String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java

@@ -110,4 +110,40 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
      * @Date 2020/7/21 22:44
      **/
     List<String> getAuditingUserIds(String actId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @param actId
+     * @author yinzuomei
+     * @description 查询已通过的人员列表
+     * @Date 2020/7/22 15:31
+     **/
+    List<ActUserRelationDTO> getPassedList(String actId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author yinzuomei
+     * @description 查询已通过的人员列表 userId集合
+     * @Date 2020/7/22 15:37
+     **/
+    List<String> getPassedListUserIds(String actId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @param actId
+     * @author yinzuomei
+     * @description 查询已拒绝过的人员列表
+     * @Date 2020/7/22 16:19
+     **/
+    List<ActUserRelationDTO> getRejectedList(String actId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author yinzuomei
+     * @description 查询已拒绝的人员列表 userId集合
+     * @Date 2020/7/22 16:19
+     **/
+    List<String> getRejectedListUserIds(String actId);
 }

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<AuditingActUserResultDTO> getAuditingList(AuditingActUserFormDTO formDTO);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.work.PassedActUserResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 报名审核-已通过列表
+     * @Date 2020/7/22 15:16
+     **/
+    List<PassedActUserResultDTO> getPassedList(AuditingActUserFormDTO formDTO);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.work.RejectedActUserResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 报名审核-已拒绝列表
+     * @Date 2020/7/22 15:50
+     **/
+    List<RejectedActUserResultDTO> getRejectedlist(AuditingActUserFormDTO formDTO);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.work.CanceledActUserResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 报名审核-已取消报名列表
+     * @Date 2020/7/22 16:35
+     **/
+    List<CanceledActUserResultDTO> getCanceledList(AuditingActUserFormDTO formDTO);
 }

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<ActUserRelationD
         return baseDao.selectAuditingUserIds(actId);
     }
 
+    /**
+     * @param actId
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @author yinzuomei
+     * @description 查询已通过的人员列表
+     * @Date 2020/7/22 15:31
+     **/
+    @Override
+    public List<ActUserRelationDTO> getPassedList(String actId) {
+        return baseDao.selectPassedList(actId);
+    }
+
+    /**
+     * @param actId
+     * @return java.util.List<java.lang.String>
+     * @author yinzuomei
+     * @description 查询已通过的人员列表 userId集合
+     * @Date 2020/7/22 15:37
+     **/
+    @Override
+    public List<String> getPassedListUserIds(String actId) {
+        return baseDao.selectPassedListUserIds(actId);
+    }
+
+    /**
+     * @param actId
+     * @return java.util.List<com.epmet.dto.ActUserRelationDTO>
+     * @author yinzuomei
+     * @description 查询已拒绝过的人员列表
+     * @Date 2020/7/22 16:19
+     **/
+    @Override
+    public List<ActUserRelationDTO> getRejectedList(String actId) {
+        return baseDao.selectRejectedList(actId);
+    }
+
+    /**
+     * @param actId
+     * @return java.util.List<java.lang.String>
+     * @author yinzuomei
+     * @description 查询已拒绝的人员列表 userId集合
+     * @Date 2020/7/22 16:19
+     **/
+    @Override
+    public List<String> getRejectedListUserIds(String actId) {
+        return  baseDao.selectRejectedListUserIds(actId);
+    }
+
 }

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<ActUserRelationDTO> 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<String> userIdList=actUserRelationService.getAuditingUserIds(formDTO.getActId());
-        //根据待审核的人员结合，查询出用户基本信息
+        //根据待审核的人员集合，查询出用户基本信息
         List<UserBaseInfoResultDTO> userInfoList=this.queryUserBaseInfo(userIdList);
-        //调用epemet_user服务获取用户的基本信息
         for(ActUserRelationDTO actUserRelationDTO:actUserRelationDTOList){
-            AuditingActUserResultDTO resultDTO=new AuditingActUserResultDTO();
+            AuditingActUserResultDTO auditingDTO=new AuditingActUserResultDTO();
-            resultDTO.setActId(formDTO.getActId());
+            auditingDTO.setActUserRelationId(actUserRelationDTO.getId());
-            resultDTO.setUserId(actUserRelationDTO.getUserId());
+            auditingDTO.setActId(formDTO.getActId());
-            resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
+            auditingDTO.setUserId(actUserRelationDTO.getUserId());
-            //微信基本信息先默认为空字符串
+            auditingDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
-            resultDTO.setRealName(NumConstant.EMPTY_STR);
+            //true: 是志愿者 false : 不是志愿者
-            resultDTO.setNickName(NumConstant.EMPTY_STR);
+            auditingDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId()));
-            resultDTO.setHeadImgUrl(NumConstant.EMPTY_STR);
+            //赋值基本信息
+            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<com.epmet.dto.result.work.PassedActUserResultDTO>
+     * @author yinzuomei
+     * @description 报名审核-已通过列表
+     * @Date 2020/7/22 15:16
+     **/
+    @Override
+    public List<PassedActUserResultDTO> getPassedList(AuditingActUserFormDTO formDTO) {
+        List<PassedActUserResultDTO> resultList=new ArrayList<>();
+        //查询已通过的人员列表
+        List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getPassedList(formDTO.getActId());
+        if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){
+            logger.info(String.format("当前活动,actId=%s已通过列表为空",formDTO.getActId()));
+            return resultList;
+        }
+        //查询已通过审核的人员id集合
+        List<String> userIdList=actUserRelationService.getPassedListUserIds(formDTO.getActId());
+        //根据已通过的人员集合，查询出用户基本信息
+        List<UserBaseInfoResultDTO> 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<com.epmet.dto.result.work.RejectedActUserResultDTO>
+     * @author yinzuomei
+     * @description 报名审核-已拒绝列表
+     * @Date 2020/7/22 15:50
+     **/
+    @Override
+    public List<RejectedActUserResultDTO> getRejectedlist(AuditingActUserFormDTO formDTO) {
+        List<RejectedActUserResultDTO> resultList=new ArrayList<>();
+        //查询已拒绝的人员列表
+        List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getRejectedList(formDTO.getActId());
+        if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){
+            logger.info(String.format("当前活动,actId=%s已拒绝列表为空",formDTO.getActId()));
+            return resultList;
+        }
+        //查询已拒绝审核的人员id集合
+        List<String> userIdList=actUserRelationService.getRejectedListUserIds(formDTO.getActId());
+        //根据已拒绝的人员集合，查询出用户基本信息
+        List<UserBaseInfoResultDTO> 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){
+            rejectedDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId()));
-                resultDTO.setVolunteerFlag(heartUserInfoDTO.getVolunteerFlag());
+            //赋值基本信息
-            }else{
+            for(UserBaseInfoResultDTO userBaseInfoResultDTO:userInfoList){
-                resultDTO.setVolunteerFlag(false);
+                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<com.epmet.dto.result.work.CanceledActUserResultDTO>
+     * @author yinzuomei
+     * @description 报名审核-已取消报名列表
+     * @Date 2020/7/22 16:35
+     **/
+    @Override
+    public List<CanceledActUserResultDTO> getCanceledList(AuditingActUserFormDTO formDTO) {
+        List<CanceledActUserResultDTO> resultList=new ArrayList<>();
+        //查询已取消的人员列表
+        List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getRejectedList(formDTO.getActId());
+        if(null==actUserRelationDTOList||actUserRelationDTOList.size()==0){
+            logger.info(String.format("当前活动,actId=%s已取消报名列表为空",formDTO.getActId()));
+            return resultList;
+        }
+        //查询已取消审核的人员id集合
+        List<String> userIdList=actUserRelationService.getRejectedListUserIds(formDTO.getActId());
+        //根据已取消的人员集合，查询出用户基本信息
+        List<UserBaseInfoResultDTO> 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());
+                    cancelDTO.setRealName(userBaseInfoResultDTO.getRealName());
-                    resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
+                    cancelDTO.setNickName(userBaseInfoResultDTO.getNickname());
-                    resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
+                    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<List<UserBaseInfoResultDTO>> resultUserList =epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
         if(resultUserList.success()&&resultUserList.getData().size()>0){
             return resultUserList.getData();

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
     </select>
+
+    <!--    根据活动id，查询已通过人员关系记录 -->
+    <select id="selectPassedList" parameterType="java.lang.String" resultType="com.epmet.dto.ActUserRelationDTO">
+        SELECT
+            aur.*
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.`STATUS` = 'passed'
+            AND aur.ACT_ID = #{actId}
+        order by aur.AUDIT_TIME desc
+    </select>
+
+    <!--  根据活动id，查询已通过人员,返回用户id集合  -->
+    <select id="selectPassedListUserIds" resultType="java.lang.String" parameterType="java.lang.String">
+         SELECT
+            distinct aur.USER_ID as userIds
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.`STATUS` = 'passed'
+            AND aur.ACT_ID = #{actId}
+        order by aur.AUDIT_TIME desc
+    </select>
+    <!-- 根据活动id，查询已拒绝人员关系记录 -->
+    <select id="selectRejectedList" parameterType="java.lang.String" resultType="com.epmet.dto.ActUserRelationDTO">
+        SELECT
+            aur.*
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.`STATUS` = 'refused'
+            AND aur.ACT_ID = #{actId}
+        order by aur.AUDIT_TIME desc
+    </select>
+    <!-- 根据活动id，查询已拒绝人员,返回用户id集合 -->
+    <select id="selectRejectedListUserIds" resultType="java.lang.String" parameterType="java.lang.String">
+         SELECT
+            distinct aur.USER_ID as userIds
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.`STATUS` = 'refused'
+            AND aur.ACT_ID = #{actId}
+        order by aur.AUDIT_TIME desc
+    </select>
 </mapper>

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
      */

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;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -161,15 +161,24 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             list=partymemberInfoDTOResult.getData();
         }
         for(UserWechatDTO userWechatDTO:userWechatDTOList){
-            UserResiInfoDTO userResiInfoDTO=userResiInfoDao.selectByUserId(userWechatDTO.getUserId());
+            //微信信息
             UserBaseInfoEntity userBaseInfoEntity=new UserBaseInfoEntity();
-
+            userBaseInfoEntity.setNickname(userWechatDTO.getNickname());
-            userBaseInfoEntity.setUserId(userResiInfoDTO.getUserId());
+            userBaseInfoEntity.setHeadImgUrl(userWechatDTO.getHeadImgUrl());
-            userBaseInfoEntity.setMobile(userResiInfoDTO.getRegMobile());
-            userBaseInfoEntity.setSurname(userResiInfoDTO.getSurname());
-            userBaseInfoEntity.setName(userResiInfoDTO.getName());
-            userBaseInfoEntity.setRealName(userResiInfoDTO.getSurname()+userResiInfoDTO.getName());
             userBaseInfoEntity.setIdNum(NumConstant.EMPTY_STR);
+            userBaseInfoEntity.setGender(userWechatDTO.getSex().toString());
+            userBaseInfoEntity.setUserId(userWechatDTO.getUserId());
+            //居民注册信息
+            UserResiInfoDTO userResiInfoDTO=userResiInfoDao.selectByUserId(userWechatDTO.getUserId());
+            if(null!=userResiInfoDTO){
+                userBaseInfoEntity.setMobile(userResiInfoDTO.getRegMobile());
+                userBaseInfoEntity.setSurname(userResiInfoDTO.getSurname());
+                userBaseInfoEntity.setName(userResiInfoDTO.getName());
+                userBaseInfoEntity.setRealName(userResiInfoDTO.getSurname()+userResiInfoDTO.getName());
+                userBaseInfoEntity.setStreet(userResiInfoDTO.getStreet());
+                userBaseInfoEntity.setDistrict(userResiInfoDTO.getDistrict());
+                userBaseInfoEntity.setBuildingAddress(userResiInfoDTO.getBuildingAddress());
+            }
             //查询党员信息
              for(PartymemberInfoDTO partymemberInfo:list){
                  if(userBaseInfoEntity.getUserId().equals(partymemberInfo.getUserId())){
@@ -177,13 +186,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                      break;
                  }
              }
-            userBaseInfoEntity.setGender(userWechatDTO.getSex().toString());
+            UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userBaseInfoEntity.getUserId());
-            userBaseInfoEntity.setStreet(userResiInfoDTO.getStreet());
+            if(null==userBaseInfoResultDTO){
-            userBaseInfoEntity.setDistrict(userResiInfoDTO.getDistrict());
+                insert(userBaseInfoEntity);
-            userBaseInfoEntity.setBuildingAddress(userResiInfoDTO.getBuildingAddress());
+            }else{
-            userBaseInfoEntity.setNickname(userWechatDTO.getNickname());
+                userBaseInfoEntity.setId(userBaseInfoResultDTO.getId());
-            userBaseInfoEntity.setHeadImgUrl(userWechatDTO.getHeadImgUrl());
+                updateById(userBaseInfoEntity);
-            baseDao.insert(userBaseInfoEntity);
+            }
         }
         return;
     }

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.UserBaseInfoDao">
 
     <resultMap type="com.epmet.entity.UserBaseInfoEntity" id="userBaseInfoMap">
-        <result property="id" column="id"/>
+        <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="mobile" column="MOBILE"/>
         <result property="surname" column="SURNAME"/>
@@ -22,11 +22,13 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="realName" column="REAL_NAME"/>
     </resultMap>
 
     <!-- 根据用户id查询user_base_info基本信息  -->
     <select id="selectListByUserIdList" parameterType="java.lang.String" resultType="com.epmet.dto.result.UserBaseInfoResultDTO">
         SELECT
+            ubi.id,
             ubi.USER_ID,
             ubi.MOBILE,
             ubi.SURNAME,