Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 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,48 @@
        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);
    }
}