From 6f302d5dcd1d47a9512151d4e31078bc98c62f08 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:31:17 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 30ede9f..1a854c9 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
@@ -28,6 +28,8 @@
import java.util.HashMap;
import java.util.List;
+import static java.util.Objects.isNull;
+
/**
* ClassName ComEventController
* Description 三说会堂事件表控制层
@@ -250,6 +252,7 @@
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
comEvent.setSpecialistName("待分配");
comEvent.setSpecialistId(null);
+ comEventService.updateEventStransferRecord(id);
return R.ok(comEventService.updateById(comEvent));
}
@@ -313,7 +316,7 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- return comEventService.calculate();
+ return R.ok(comEventService.calculate(getLoginUserInfo()));
}
/**
@@ -333,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();
+ }
+
}
--
Gitblit v1.7.1