人员列表

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java

@@ -0,0 +1,96 @@
+package com.epmet.dto.result.work;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/6/30 17:58
+ */
+@Data
+public class ActUserResDTO implements Serializable {
+    private static final long serialVersionUID = 7621004224467504031L;
+    /**
+     * 主键
+     */
+    private String actUserRelationId;
+
+    /**
+     * 活动id
+     */
+    private String actId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 报名时间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;
+
+    /**
+     * 实际参加活动个数
+     */
+    private Integer signInActNum;
+    /**
+     * 报名活动个数
+     */
+    private Integer signUpActNum;
+    /**
+     * 获得积分活动个数
+     */
+    private Integer obtainPointsActNum;
+
+    /**
+     * 已处理: handled;  默认"",重新处理时reward_flag置为空字符串
+     */
+    private String processFlag;
+
+    /**
+     * 已签到:signed_in; 默认""
+     */
+    private String signInFlag;
+
+    /**
+     * 已给分：agree, 不给分：deny  默认""
+     */
+    private String rewardFlag;
+    public ActUserResDTO(){
+        this.signInActNum=0;
+        this.signUpActNum=0;
+        this.obtainPointsActNum=0;
+    }
+}
+

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.work.AactUserDetailFormDTO;
@@ -174,4 +175,16 @@ public class WorkActUserController {
         ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
         return new Result<List<CanceledUserResultDTO>>().ok(workActUserService.queryCanceledUserList(formDTO));
     }
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("userlist")
+    public Result<PageData<ActUserResDTO>> queryUserList(@RequestBody ActIdFormDTO formDTO){
+        return new Result<PageData<ActUserResDTO>>().ok(workActUserService.queryUserList(formDTO.getActId()));
+    }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.work.AactUserDetailFormDTO;
 import com.epmet.dto.form.work.ActIdFormDTO;
 import com.epmet.dto.form.work.AuditUserFormDTO;
@@ -141,4 +142,11 @@ public interface WorkActUserService {
      * @Date 2020/7/24 12:52
      **/
     Boolean getVolunteerFlag(String userId);
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     * @param actId
+     * @return
+     */
+    PageData<ActUserResDTO> queryUserList(String actId);
 }

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

@@ -6,7 +6,9 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ActConstant;
 import com.epmet.constant.ActMessageConstant;
@@ -36,6 +38,7 @@ import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserRelationService;
 import com.epmet.service.HeartUserInfoService;
 import com.epmet.service.WorkActUserService;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -46,6 +49,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 工作端：活动人员相关api
@@ -775,4 +780,48 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         }
         return resultUserList.getData().get(0);
     }
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     *
+     * @param actId
+     * @return
+     */
+    @Override
+    public PageData<ActUserResDTO> queryUserList(String actId) {
+        List<ActUserResDTO> list = new ArrayList<>();
+        // 活动相关人员
+        List<ActUserRelationDTO> actUserRelationDTOList = actUserRelationService.getUserList(actId, StrConstant.EPMETY_STR);
+        if (null == actUserRelationDTOList || actUserRelationDTOList.size() == 0) {
+            return new PageData<>(list, NumConstant.ZERO);
+        }
+        // 查询人员id集合
+        Set<String> userIdList = actUserRelationDTOList.stream().map(ActUserRelationDTO::getUserId).collect(Collectors.toSet());
+        // 查询出用户基本信息
+        List<UserBaseInfoResultDTO> userInfoList = this.queryUserBaseInfoList(new ArrayList<>(userIdList));
+        for (ActUserRelationDTO actUserRelationDTO : actUserRelationDTOList) {
+            ActUserResDTO resultDTO = ConvertUtils.sourceToTarget(actUserRelationDTO,ActUserResDTO.class);
+            resultDTO.setActUserRelationId(actUserRelationDTO.getId());
+            resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
+            // true: 是志愿者 false : 不是志愿者
+            resultDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId()));
+            // 赋值基本信息
+            for (UserBaseInfoResultDTO userBaseInfoResultDTO : userInfoList) {
+                if (actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())) {
+                    resultDTO.setRealName(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName()) ? userBaseInfoResultDTO.getRealName() : StrConstant.EPMETY_STR);
+                    resultDTO.setNickName(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname()) ? userBaseInfoResultDTO.getNickname() : StrConstant.EPMETY_STR);
+                    resultDTO.setMobile(StringUtils.isNotBlank(userBaseInfoResultDTO.getMobile()) ? userBaseInfoResultDTO.getMobile() : StrConstant.EPMETY_STR);
+                    resultDTO.setIdNum(StringUtils.isNotBlank(userBaseInfoResultDTO.getIdNum()) ? userBaseInfoResultDTO.getIdNum() : StrConstant.EPMETY_STR);
+                    break;
+                }
+            }
+            HistoricalActInfo historicalActInfo = this.getHistoricalActInfo(resultDTO.getUserId(), actId);
+            resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
+            resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
+            resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum());
+            list.add(resultDTO);
+        }
+        PageInfo<ActUserResDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }