From e32ef61f9bcbc5d542d19e56f6c96f18bd02c6e9 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期二, 29 十一月 2022 16:56:02 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java index ba428f5..94d2865 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java @@ -41,6 +41,16 @@ } /** + * 分页查询可关联清单列表 + * @param neighborCircleAppDTO + * @return + */ + @PostMapping("pageRelationList") + public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { + return comActNeighborCircleService.pageRelationList(neighborCircleAppDTO); + } + + /** * 分页查询邻里圈列表 * * @param neighborCircleAppDTO @@ -387,4 +397,50 @@ return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO); } + /** + * 机关单位服务统计排行 + * @return + * */ + @GetMapping("/activityAnalysis") + public 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 = "belongTo",required = false) String belongTo, + @RequestParam(value = "size",required = false) Integer size, + @RequestParam(value = "unitId",required = false) Long unitId, + @RequestParam(value = "loginAccount",required = false) String loginAccount){ + return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId); + } + + /** + * 小程序服务统计 + * @param serviceStaticDTO + * @return + */ + @PostMapping("/serviceStatic") + public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){ + return this.comActNeighborCircleService.serviceStatic(serviceStaticDTO); + } + + /** + * 后台统计 + * @param serviceStaticDTO + * @return + */ + @PostMapping("/serviceStaticBackstage") + public R serviceStaticBackstage(@RequestBody ServiceStaticBackstageDTO serviceStaticDTO){ + return this.comActNeighborCircleService.serviceStaticBackstage(serviceStaticDTO); + } + /** + * 求助我的问题数量统计 + * @param type + * @param phone + * @return + */ + @GetMapping("/selectCount") + public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){ + return this.comActNeighborCircleService.selectCount(type,phone,communityId); + } + + } -- Gitblit v1.7.1