审核通过时，添加小组类型

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;
 }

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;
+
     /**
      * 组统计信息
      * */

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;
 }

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);
 			}
 

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