From 5b48b6e57089874e397a9baa42c166f4bd367d76 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 17 Nov 2020 14:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=8F=82=EF=BC=9AauditSwitch=20=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=9B=E7=BB=84=E5=AE=A1=E6=A0=B8open=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=EF=BC=9Bclose=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/group/result/GroupSummarizeResultDTO.java | 5 +++++
 .../src/main/resources/mapper/group/ResiGroupDao.xml         | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
index 9e54c59eb5..0b19208c9f 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
@@ -65,6 +65,10 @@ public class GroupSummarizeResultDTO implements Serializable {
 	 */
 	private String leaderFlag;
 
+	/**
+	 * 进组审核open开启；close关闭
+	 */
+	private String auditSwitch;
 	public GroupSummarizeResultDTO(){
 		this.setGroupId("");
 		this.setGroupHeadPhoto("");
@@ -76,5 +80,6 @@ public class GroupSummarizeResultDTO implements Serializable {
 		this.setTotalApplyingMember(NumConstant.ZERO);
 		this.setTotalTopics(NumConstant.ZERO);
 		this.setLeaderFlag("");
+		this.setAuditSwitch("open");
 	}
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 119db46b30..9f7b719a64 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -150,7 +150,8 @@
                     AND gmo.GROUP_ID = rg.id
                     AND gmo.OPERATE_STATUS = 'under_auditting'
             ) AS totalApplyingMember,
-            rgs.TOTAL_TOPICS
+            rgs.TOTAL_TOPICS,
+            rg.AUDIT_SWITCH
         FROM
             resi_group rg
             LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )