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> + * @Author: lichao + * @Date: 2023/9/11 15:04 + */ + @GetMapping("screenJinShui/page") + public Result> screenJinShuiPage(@RequestParam Map params){ + PageData page = partyTopicService.listPage(params); + return new Result>().ok(page); + } + + /** + * @Description: 大屏话题详情 + * @param id: + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/9/11 15:04 + */ + @GetMapping("screenJinShui/detail/{id}") + public Result getScreenJinShuiDetail(@PathVariable("id") String id){ + PartyTopicDTO data = partyTopicService.get(id); + return new Result().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 @@ + +