From 70e7fd0ab091b64a4fa5c13fcb77bc7471ea3833 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:33:53 +0800
Subject: [PATCH] Merge branch 'local_20221115' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 a5fdb5a..e0ba75a 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 三说会堂事件表控制层
@@ -64,6 +66,7 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
+ comEvent.setAppId(loginUser.getAppId());
return comEventService.insertComEvent(comEvent);
}
@@ -154,7 +157,6 @@
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- comEvent.setUserType(comEventVO.getUserType());
return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
@@ -251,8 +253,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));
}
@@ -316,7 +317,7 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- return comEventService.calculate();
+ return comEventService.calculate(getLoginUserInfo());
}
/**
@@ -336,4 +337,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