创建小组添加 groupType

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

@@ -373,9 +373,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 
 		//2.内容检查
-		scanGroupEditContent(applyCreateGroupFormDTO.getGroupName(),
-				applyCreateGroupFormDTO.getGroupIntroduction(),
-				applyCreateGroupFormDTO.getGroupHeadPhoto());
+//		scanGroupEditContent(applyCreateGroupFormDTO.getGroupName(),
+//				applyCreateGroupFormDTO.getGroupIntroduction(),
+//				applyCreateGroupFormDTO.getGroupHeadPhoto());
 
 		//3.1、查询当前申请人的身份，生成对应格式的消息内容
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
@@ -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;
 	}