From 7a7c01d8ae0c0f2d7ffcaf8de5a7a1d49ba92c10 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 30 十一月 2022 17:59:20 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 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 80ee2d1..168f03f 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
@@ -3521,6 +3521,15 @@
     R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
 
     /**
+     * 统计大屏查询清单列表
+     *
+     * @param comActNeighborCircleAdminDTO
+     *            请求参数
+     * @return 邻里圈列表
+     */
+    @PostMapping("/neighbor/pageNeighborByAdmin")
+    R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+    /**
      * 后台修改邻里圈
      *
      * @param editNeighborCircleAdminVO
@@ -11111,4 +11120,35 @@
      */
     @GetMapping("/shopFlower/countSaleByUserId")
     R countSaleByUserId(@RequestParam("userId") Long userId);
+
+    /**
+     * 查询统计基础数据
+     * @return
+     */
+    @GetMapping("/selectBasicData")
+    R selectBasicData();
+
+    /**
+     * 统计在职干部特长
+     * @return
+     */
+    @GetMapping("/statisticsPbMemberType")
+    R statisticsPbMemberType();
+
+
+    /**
+     * 统计单位
+     * @return
+     */
+    @GetMapping("/selectUnitByNatureName")
+    R selectUnitByNatureName();
+
+    /**
+     * 大屏-社区活动分页
+     * @return
+     */
+    @PostMapping("pageActivityBigScreen")
+    R pageActivityBigScreen(@RequestBody CommonPage commonPage);
+
+
 }

--
Gitblit v1.7.1