From 4521a47e5d9d8e1bd499991a7ccdb45c07981ce0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 29 Apr 2021 13:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=88=9B=E5=BB=BA=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=EF=BC=8C=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0groupType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/group/dto/group/result/CreatedResultDTO.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/CreatedResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java index d51285725a..ebeeea752c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java @@ -41,4 +41,9 @@ public class CreatedResultDTO implements Serializable { * （审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed） */ private String groupState; + + /** + * 小组类型(ordinary:楼院小组 branch:支部小组) + */ + private String groupType; } 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 38140fe84e..2d424313a8 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 @@ -101,7 +101,8 @@ rg.GROUP_NAME AS groupName, rgs.TOTAL_MEMBERS AS totalMember, rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember, - rg.STATE AS groupState + rg.STATE AS groupState, + rg.GROUP_TYPE AS groupType FROM resi_group_member rgm LEFT JOIN resi_group rg ON ( rgm.RESI_GROUP_ID = rg.ID )