From c36f719ebd38b9fe269547dbc036d8535b498ce9 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 16:43:51 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 ad1ad31..cfb768b 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
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
@@ -28,6 +29,8 @@
import java.util.HashMap;
import java.util.List;
+import static java.util.Objects.isNull;
+
/**
* ClassName ComEventController
* Description 三说会堂事件表控制层
@@ -43,6 +46,8 @@
@Resource
private IComEventService comEventService;
+ @Resource
+ private UserService userService;
/**
@@ -64,6 +69,7 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
+ //comEvent.setAppId(loginUser.getAppId());
return comEventService.insertComEvent(comEvent);
}
@@ -250,8 +256,7 @@
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
comEvent.setSpecialistName("待分配");
comEvent.setSpecialistId(null);
- comEvent.setSpecialistName("待分配");
- comEvent.setSpecialistId(0L);
+ comEventService.updateEventStransferRecord(id);
return R.ok(comEventService.updateById(comEvent));
}
@@ -315,7 +320,7 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- return comEventService.calculate();
+ return comEventService.calculate(getLoginUserInfo());
}
/**
@@ -335,4 +340,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();
+ }
+
}
--
Gitblit v1.7.1