Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java

@@ -69,4 +69,10 @@ public class ApplyCreateGroupFormDTO implements Serializable {
      * 小组是否允许参观:允许：open;不允许：closed
      */
     private String visitSwitch;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    @NotBlank(message = "小组类型不能为空")
+    private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/MyGroupResultDTO.java

@@ -52,4 +52,9 @@ public class MyGroupResultDTO implements Serializable {
 	 * 最新话题
 	 */
 	private LatestTopicDTO latestTopic;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java

@@ -43,4 +43,9 @@ public class RecommendGroupResultDTO implements Serializable {
 	 */
 	private String status="";
 
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java

@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -518,6 +518,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setCreatedBy(applyCreateGroupFormDTO.getUserId());
 		resiGroupEntity.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
 		resiGroupEntity.setVisitSwitch(StringUtils.isNotBlank(applyCreateGroupFormDTO.getVisitSwitch()) ? applyCreateGroupFormDTO.getVisitSwitch() : GroupStateConstant.CLOSED);
+		resiGroupEntity.setGroupType(applyCreateGroupFormDTO.getGroupType());
 		return resiGroupEntity;
 	}
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -24,7 +24,8 @@
             rgs.TOTAL_MEMBERS ,
             rgs.TOTAL_PARTY_MEMBERS ,
             rg.STATE ,
-            rgm.GROUP_LEADER_FLAG
+            rgm.GROUP_LEADER_FLAG,
+            rg.GROUP_TYPE
         FROM
             resi_group_member rgm
             LEFT JOIN resi_group rg ON ( rgm.RESI_GROUP_ID = rg.ID )
@@ -64,6 +65,7 @@
             rg.id AS groupId,
             rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
             rg.GROUP_NAME AS groupName,
+            rg.GROUP_TYPE AS groupType,
             rgs.TOTAL_MEMBERS AS totalMember,
             rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
         FROM
@@ -85,6 +87,7 @@
             and rg.CUSTOMER_ID=#{customerId}
             and rg.GRID_ID=#{gridId}
             and rg.STATE ='approved'
+            and rg.GROUP_TYPE != 'branch'
          order by totalMember desc,rg.LATEST_TOPIC_PUBLISH_DATE desc
          LIMIT #{pageNo}, #{pageSize}
     </select>