From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 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..e97688b 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/pageNeighborByBigScreen")
+    R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+    /**
      * 后台修改邻里圈
      *
      * @param editNeighborCircleAdminVO
@@ -11111,4 +11120,55 @@
      */
     @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 PageBaseDTO pageBaseDTO);
+
+    /**
+     * 疫情防控 健康码统计
+     * @return
+     */
+    @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+    R selectColorMarkGroup();
+
+
+    @GetMapping("easyphoto/selectStatisticsPhoto")
+    R selectStatisticsPhoto();
+
+    /**
+     * 获取商家周围 n(km)的自提点数量
+     *
+     * @param distance
+     * @return
+     */
+    @GetMapping("/convenient/point/findPointNumByDistance")
+    R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+
 }

--
Gitblit v1.7.1