工作端：已报名列表修改

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<java.util.List<com.epmet.dto.result.work.AuditingActUserResultDTO>>
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-待审核列表
-     * @Date 2020/7/21 22:24 
+     * @Date 2020/7/21 22:24
      **/
     @PostMapping("auditinglist")
     public Result<List<AuditingActUserResultDTO>> 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<List<PassedActUserResultDTO>> 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<List<RejectedActUserResultDTO>> 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<java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>>
      * @param formDTO
      * @author yinzuomei
-     * @description 已结束-已参加人员列表
-     * @Date 2020/7/24 10:17 
+     * @description 已结束-已参加人员列表(审核中、审核通过)
+     * @Date 2020/7/24 10:17
      **/
     @PostMapping("joinuserlist")
     public Result<List<JoinedUserResultDTO>> 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<List<CanceledUserResultDTO>> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){

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

@@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @Date 15:59 2020-07-30
      **/
     String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author zhangyong
+     * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合
+     * @Date 2020/7/21 22:44
+     **/
+    List<String> getSignUpUserIdList(@Param("actId") String actId);
 }

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

@@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
      * @Date 17:14 2020-07-30
      **/
     Result<ResiActRegistrationResultDTO> registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author zhangyong
+     * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合
+     * @Date 2020/7/21 22:44
+     **/
+    List<String> getSignUpUserIdList(@Param("actId") String actId);
 }

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<ActUserRelationD
         return new Result();
     }
 
+    @Override
+    public List<String> getSignUpUserIdList(String actId) {
+        return baseDao.getSignUpUserIdList(actId);
+    }
+
     /**
      * 开始报名活动
      *

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<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId());
         if(null!=list&&list.size()>0){
-            //查询已通过审核的人员id集合
-            List<String> userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED);
+            //查询已报名(审核中、审核通过)的人员id集合
+            List<String> userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId());
             //根据已通过的人员集合，查询出用户基本信息
             List<UserBaseInfoResultDTO> userInfoList=this.queryUserBaseInfoList(userIdList);
             for(JoinedUserResultDTO joinedUserResultDTO:list){

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}
     </select>
+
+    <!--    根据活动id，当前状态（已报名/待审核auditing，审核通过passed）返回用户id集合 -->
+    <select id="getSignUpUserIdList" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            distinct aur.USER_ID as userIds
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND ( aur.STATUS = 'auditing' OR aur.`STATUS` = 'passed' )
+            AND aur.ACT_ID = #{actId}
+            order by aur.CREATED_TIME desc
+    </select>
 </mapper>