From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   15 +++++++++++++++
 1 files changed, 15 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 2278b59..faa159c 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
@@ -5941,6 +5941,9 @@
     @PostMapping("/neighbor/update")
     R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
 
+    @PostMapping("/neighbor/serviceStatic")
+    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+
     /**
      * 获取系统配置value
      * @param key   系统配置code
@@ -9674,6 +9677,9 @@
     @GetMapping("/comActAcidRecord/statics")
     R comActAcidRecordStatics(@RequestParam("date")String date);
 
+    @GetMapping("/comActAcidRecord/test")
+    R test();
+
     /**
      * 分页查询所有数据
      *
@@ -9873,4 +9879,13 @@
      */
     @PostMapping("/comActAcidCheckRecord/update")
     R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+    /**
+     * 单位活动统计
+     */
+    @GetMapping("/neighbor/institutionalUnitServiceAnalysis")
+    R institutionalUnitServiceAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId);
+
+    @GetMapping("/bcRegion/levelList")
+    R levelList();
 }

--
Gitblit v1.7.1