Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -316,8 +316,7 @@
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @GetMapping("/status/calculate")
    public R calculate() {
        comEventService.calculate(getLoginUserInfo());
        return R.ok();
        return comEventService.calculate(getLoginUserInfo());
    }

    /**
@@ -337,4 +336,22 @@
    public R eventIndexData(@RequestParam Integer type) {
        return comEventService.eventIndexData(type);
    }


    /**
     *可选街道列表
     * */
    @GetMapping("/streetList")
    public R getStreetId(){
        return comEventService.listStreetScreen();
    }

    /**
     *可选社区列表
     * */
    @GetMapping("/communityList")
    public R getCommunityList(){
        return comEventService.listCommunityScreen();
    }

}