From be24f91b4dc1b263ca3fd9b57dc74883f3633fc6 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 29 Dec 2020 11:03:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A41+1=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=A4=BE=E5=8C=BA=E5=90=8D=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/PartyGroupDTO.java | 9 +++++++-- .../esua/epdc/dto/result/PartyGroupResultDTO.java | 6 +++++- .../com/elink/esua/epdc/entity/PartyGroupEntity.java | 9 ++++++--- .../src/main/resources/mapper/PartyGroupDao.xml | 11 +++++++---- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java index 3f655e00..8f55de32 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java @@ -25,7 +25,7 @@ import java.util.List; /** - * 党群表 + * 党群表 * * @author elink elink@elink-cn.com * @since v1.0.0 2020-05-29 @@ -138,4 +138,9 @@ public class PartyGroupDTO implements Serializable { */ private List deptIdList; -} \ No newline at end of file + /** + * 关联社区名称 + */ + private String relationCommunity; + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupResultDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupResultDTO.java index 95fabce9..34410ad3 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupResultDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupResultDTO.java @@ -53,5 +53,9 @@ public class PartyGroupResultDTO implements Serializable { */ private String isJoin; + /** + * 所属社区名称 + */ + private String relationCommunity; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java index 04d2262c..b02361ad 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java @@ -23,7 +23,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 党群表 + * 党群表 * * @author elink elink@elink-cn.com * @since v1.0.0 2020-05-29 @@ -90,6 +90,9 @@ public class PartyGroupEntity extends BaseEpdcEntity { */ private Integer sort; + /** + * 关联社区名称 + */ + private String relationCommunity; - -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml index 78ad9ee9..bda7802a 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml @@ -60,7 +60,8 @@ t.UPDATED_BY, t.UPDATED_TIME, t1.NICKNAME, - t.SORT + t.SORT, + t.RELATION_COMMUNITY from epdc_party_group t left join (select PARTY_GROUP_ID,NICKNAME from epdc_party_user_group where IDENTITY_FLAG = '0' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID where t.DEL_FLAG ='0' @@ -89,7 +90,8 @@ t.UPDATED_TIME, t1.NICKNAME, t1.USER_ID, - t.SORT + t.SORT, + t.RELATION_COMMUNITY from epdc_party_group t left join (select PARTY_GROUP_ID,NICKNAME,USER_ID from epdc_party_user_group where IDENTITY_FLAG = '0' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID where t.DEL_FLAG ='0' and t.ID = #{id} @@ -101,7 +103,8 @@ t.ID, t.PARTY_GROUP_NAME, t.PARTY_GROUP_AVATAR, - if(t1.ID is not null ,1,0) as isJoin + if(t1.ID is not null ,1,0) as isJoin, + t.RELATION_COMMUNITY from epdc_party_group t left join epdc_party_user_group t1 on t1.PARTY_GROUP_ID = t.ID and t1.DEL_FLAG ='0' and t1.USER_ID=#{userId} where t.DEL_FLAG ='0' and t.STATE ='0' order by t.SORT, t.CREATED_TIME desc @@ -124,4 +127,4 @@ UPDATE epdc_party_topic SET DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId} - \ No newline at end of file +