From beea1a8c4021746ba1311660a96fb5cb477bf6a7 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 7 Aug 2020 16:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=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

---
 .../src/main/java/com/epmet/dao/ActInfoDao.java              | 2 +-
 .../src/main/resources/mapper/ActInfoDao.xml                 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
index 002bd3a6b3..b4fea5476a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
@@ -258,7 +258,7 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @return java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>
      * @param actId
      * @author yinzuomei
-     * @description 已结束-已参加人员列表
+     * @description 已结束-已参加人员列表(审核中、审核通过)
      * @Date 2020/7/24 10:18
      **/
     List<JoinedUserResultDTO> queryJoinUserList(String actId);
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 8732b7c248..2d442beff6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -551,7 +551,7 @@
         limit #{pageNo}, #{pageSize}
     </select>
 
-    <!--  已结束-已参加人员列表  -->
+    <!--  已结束-已报名人员列表(审核中、审核通过)  -->
     <select id="queryJoinUserList" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.JoinedUserResultDTO">
         SELECT
             aur.id as actUserRelationId,
@@ -572,7 +572,8 @@
             and ai.DEL_FLAG='0')
         WHERE
             aur.DEL_FLAG = '0'
-            AND aur.`STATUS` = 'passed'
+            AND aur.`STATUS` != 'refused'
+            AND aur.`STATUS` != 'canceled'
             AND aur.ACT_ID =#{actId}
             order by aur.CREATED_TIME  asc
     </select>