From 0c8807d7017a402a843fec0451e37335c86d816d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 16:30:43 +0800
Subject: [PATCH] 修改杨家坪社区问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 2585439..3eb4eda 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
@@ -14,6 +14,7 @@
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
+import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,6 +51,8 @@
private IComEventService comEventService;
@Resource
private UserService userService;
+ @Resource
+ private ComSanShuoExpertService comSanShuoExpertService;
/**
@@ -167,10 +170,14 @@
BeanUtils.copyProperties(comEventVO, comEvent);
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
if (isNull(comEventVO.getAppId())){
- String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+// String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+ String appId = getAppId();
comEvent.setAppId(appId);
}
- return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
+ LoginUserInfoVO loginUserInfo1 = this.getLoginUserInfo();
+ loginUserInfo1.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
+ loginUserInfo1.setType(loginUserInfo.getType());
+ return comEventService.pageByComEvent(comEvent, pagination,loginUserInfo1);
}
@@ -329,8 +336,10 @@
*/
@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) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+// loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
+ return comEventService.calculate(loginUserInfo,level,id);
}
/**
@@ -368,4 +377,12 @@
return comEventService.listCommunityScreen();
}
+ /**
+ * 获取事件范围筛选列表
+ * */
+ @GetMapping("/rangeList")
+ public R rangeList(){
+ return comSanShuoExpertService.rangeList();
+ }
+
}
--
Gitblit v1.7.1