党群1+1新增所属社区名称字段

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<String> deptIdList;
 
-}
+    /**
+     *  关联社区名称
+     */
+    private String relationCommunity;
+
+}

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

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

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 id="updateGridByDeptId">
         UPDATE epdc_party_topic SET DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId}
     </update>
-</mapper>
+</mapper>