From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期四, 08 十二月 2022 13:16:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java index ce7841d..e7fdfca 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java @@ -168,8 +168,6 @@ Page pagination = new Page(pageNo, pageSize); ComEvent comEvent=new ComEvent(); BeanUtils.copyProperties(comEventVO, comEvent); - log.info("==================参数vo"+comEventVO); - log.info("==================参数comEvent"+comEvent); LoginUserInfoVO loginUserInfo = getLoginUserInfo(); if (isNull(comEventVO.getAppId())){ String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId(); @@ -334,8 +332,8 @@ */ @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计") @GetMapping("/status/calculate") - public R calculate() { - return comEventService.calculate(getLoginUserInfo()); + public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id) { + return comEventService.calculate(getLoginUserInfo(),level,id); } /** -- Gitblit v1.7.1