From e3cc62059ecb0ad869490f6e46304853838d9ba5 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 15:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9Estatus=E8=BF=94=E5=8F=82?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=A1=E6=A0=B8=E4=B8=AD=20-=20under=5Fauditting?=
 =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=20-=20approved?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E7=BE=A4=E8=A2=AB=E6=8B=92=20-=20rejected=20?=
 =?UTF-8?q?=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/member/result/ApplyingMemberResultDTO.java  | 8 ++++++++
 .../main/resources/mapper/member/ResiGroupMemberDao.xml   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
index bdb19c1ec3..881333be54 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
@@ -37,4 +37,12 @@ public class ApplyingMemberResultDTO implements Serializable {
 	 * 入群理由
 	 */
 	private String applyReason;
+
+
+	/**
+	 * 状态：审核中 - under_auditting、
+	 * 审核通过 - approved、
+	 * 入群被拒 - rejected 、
+	 */
+	private String status;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index b618ff112d..4a47034b33 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -30,12 +30,14 @@
 		gmo.CUSTOMER_USER_ID AS applyUserId,
 		NULL AS applyUserHeadPhoto,
 		NULL AS applyUserName,
-		gmo.OPERATE_DES AS applyReason
+		gmo.OPERATE_DES AS applyReason,
+		gmo.OPERATE_STATUS as status
 	FROM
 		group_memeber_operation gmo
 	WHERE
 		gmo.DEL_FLAG = '0'
 		AND gmo.GROUP_ID = #{groupId}
+		and gmo.ENTER_GROUP_TYPE!='created'
 		AND gmo.OPERATE_STATUS IN ( 'under_auditting', 'approved', 'rejected' )
 	ORDER BY
 		gmo.CREATED_TIME DESC