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