From 6df41196821df140916c6d75f25f3582c6223961 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 20 Apr 2021 09:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=BB=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/resi/group/dto/group/ResiGroupDTO.java  | 4 ++++
 .../epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java  | 5 +++++
 .../resi/group/dto/group/result/GroupsInGridResultDTO.java | 5 +++++
 .../modules/group/service/impl/ResiGroupServiceImpl.java   | 7 +++++++
 .../resources/mapper/group/GroupEditSubmitRecordDao.xml    | 1 +
 5 files changed, 22 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
index b2d57ecc1d..eb83fd5162 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
@@ -115,4 +115,8 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      */
 	private Date updatedTime;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+	private String groupType;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java
index f2c52f6804..88fa69ac31 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java
@@ -56,6 +56,11 @@ public class ResiGroupInfoRedisDTO implements Serializable{
      * */
     private String latestTopicPublishDate;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
     /**
      * 组统计信息
      * */
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java
index fa4d22740a..b936405627 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java
@@ -38,4 +38,9 @@ public class GroupsInGridResultDTO implements Serializable {
 	 * 当前状态审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed
 	 */
 	private String status;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 1479a45456..a3770a028c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -802,6 +802,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					groupsInGridResultDTO.setStatus(group.getState());
 					groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
 					groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
+					groupsInGridResultDTO.setGroupType(group.getGroupType());
 					resultList.add(groupsInGridResultDTO);
 			} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
 				//缓存中获取组信息
@@ -812,6 +813,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
 				groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
 				groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
+				if (StringUtils.isNotEmpty(resiGroupInfoRedisDTO.getGroupType())){
+					groupsInGridResultDTO.setGroupType(resiGroupInfoRedisDTO.getGroupType());
+				}else {
+					ResiGroupDTO resiGroupDTO = get(group.getId());
+					groupsInGridResultDTO.setGroupType(resiGroupDTO.getGroupType());
+				}
 				resultList.add(groupsInGridResultDTO);
 			}
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
index b9b2924cdb..d282690dea 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
@@ -72,6 +72,7 @@
             edit.GROUP_ID,
             groupp.GROUP_NAME,
             groupp.GROUP_HEAD_PHOTO,
+            groupp.GROUP_TYPE,
             edit.READ_FLAG,
             edit.MESSAGE_TEXT,
             DATE_FORMAT( edit.CREATED_TIME, '%Y-%m-%d %H:%i' ) AS createdTime