From ef19ae49b75d7b16cbf483b678ea4bec8f24e71c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 22 七月 2022 09:15:18 +0800
Subject: [PATCH] 五项统计bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 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..86d3ab1 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
@@ -36,6 +36,8 @@
 import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
 import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
 import com.panzhihua.common.model.vos.community.social.*;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import com.panzhihua.common.model.vos.community.*;
 import org.springframework.beans.BeanUtils;
@@ -5941,6 +5943,10 @@
     @PostMapping("/neighbor/update")
     R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
 
+    @PostMapping("/neighbor/serviceStatic")
+    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+
+
     /**
      * 获取系统配置value
      * @param key   系统配置code
@@ -9669,10 +9675,13 @@
      * @return
      */
     @GetMapping("/comActAcidRecord/fiveCountPlus")
-    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);
 
     @GetMapping("/comActAcidRecord/statics")
     R comActAcidRecordStatics(@RequestParam("date")String date);
+
+    @GetMapping("/comActAcidRecord/test")
+    R test();
 
     /**
      * 分页查询所有数据
@@ -9873,4 +9882,23 @@
      */
     @PostMapping("/comActAcidCheckRecord/update")
     R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+    @GetMapping("/bcRegion/levelList")
+    R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);
+
+    @GetMapping("/bcRegion/levelListBackstage")
+    R levelListBackstage();
+
+    /**
+     * 单位活动统计
+     */
+    @GetMapping("/neighbor/activityAnalysis")
+    R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
+                                       @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+                                       @RequestParam(value = "page",required = false) Integer page,
+                                       @RequestParam(value = "size",required = false) Integer size,
+                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
+                                       @RequestParam(value = "unitId",required = false) Long unitId,
+                                       @RequestParam(value = "loginAccount",required = false) String loginAccount);
+
 }

--
Gitblit v1.7.1