From 4ab5804c5095c881cd2802b8720f6a8bd0eadf7c Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 12 Sep 2023 09:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AF=9D=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/PartyTopicController.java | 26 +++++++++++++++++++
 .../esua/epdc/dto/ScreenCommunityDTO.java     | 10 +++++++
 .../epdc/entity/ScreenCommunityEntity.java    | 10 +++++++
 .../resources/mapper/ScreenCommunityDao.xml   |  2 ++
 4 files changed, 48 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java
index 99fdb232..0a79c121 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyTopicController.java
@@ -115,4 +115,30 @@ public class PartyTopicController {
         return partyTopicService.modifyTopicTopFlag(formDto);
     }
 
+    /**
+     * @Description: 大屏话题列表
+     * @param params:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyTopicDTO>>
+     * @Author: lichao
+     * @Date: 2023/9/11 15:04
+     */
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<PartyTopicDTO>> screenJinShuiPage(@RequestParam Map<String, Object> params){
+        PageData<PartyTopicDTO> page = partyTopicService.listPage(params);
+        return new Result<PageData<PartyTopicDTO>>().ok(page);
+    }
+
+    /**
+     * @Description: 大屏话题详情
+     * @param id:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.PartyTopicDTO>
+     * @Author: lichao
+     * @Date: 2023/9/11 15:04
+     */
+    @GetMapping("screenJinShui/detail/{id}")
+    public Result<PartyTopicDTO> getScreenJinShuiDetail(@PathVariable("id") String id){
+        PartyTopicDTO data = partyTopicService.get(id);
+        return new Result<PartyTopicDTO>().ok(data);
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java
index e6c75430..eb45a335 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java
@@ -103,6 +103,16 @@ public class ScreenCommunityDTO implements Serializable {
      */
 	private Integer partyMemberNum;
 
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 党群id
+     */
+    private String partyGroupId;
+
     /**
      * 创建人
      */
diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java
index 6cafe856..fe484215 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java
@@ -103,4 +103,14 @@ public class ScreenCommunityEntity extends BaseEpdcEntity {
 	 */
 	private Integer isParty;
 
+	/**
+	 * 部门id
+	 */
+	private String deptId;
+
+	/**
+	 * 党群id
+	 */
+	private String partyGroupId;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml
index 9a319340..19d0ee8a 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml
@@ -18,6 +18,8 @@
         <result property="partyMemberNum" column="PARTY_MEMBER_NUM"/>
         <result property="volunteerCount" column="VOLUNTEER_COUNT"/>
         <result property="isParty" column="IS_PARTY"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="partyGroupId" column="PARTY_GROUP_ID"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>