From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index da1c664..15eb04b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9367,4 +9367,112 @@
      */
     @GetMapping("/building/getBuildListByVillageId")
     R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
+    /**
+     * 党员活动详情数据
+     * @return
+     */
+    @PostMapping("/activity/partyMemberDetail")
+    R partyMemberDetail(@RequestBody CommonPage commonPage);
+    /**
+     * 导出党员活动详情数据
+     * @return
+     */
+    @PostMapping("/activity/exportPartyMemberDetail")
+    R exportPartyMemberDetail(@RequestBody CommonPage commonPage);
+
+    /**
+     * 金沙定制页面-党建引领基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/partyBuildIng/base")
+    R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 党员活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/partyBuildIng/partyAct")
+    R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 议事投票展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/partyBuildIng/discuss")
+    R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 金沙定制页面-四长四员
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/fourMember/base")
+    R getFourMemberBaseData(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 杨家坪定制页面-五微服务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/fms/base")
+    R getFmsBaseData(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 杨家坪定制页面-微团队展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/fms/team")
+    R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 杨家坪定制页面-居家养老基础数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/alarm/base")
+    R getAlarmBaseData(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 杨家坪定制页面-报警记录展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/alarm/record")
+    R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 杨家坪定制页面-报警设备点位图
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/alarm/pointMap")
+    R getAlarmPointMap(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 杨家坪定制页面-志愿服务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/volunteer/base")
+    R getVolunteerBaseData(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 金沙定制页面-志愿线展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/partyBuildIng/microWish")
+    R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 金沙定制页面-四长四员解决问题展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/fourMember/resolve")
+    R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
 }

--
Gitblit v1.7.1