From 08d38fab4e81e780a5edef7ca02d66b1dc29991c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 14:11:14 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 b9d27c1..9e3a443 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 三说会堂事件表控制层
@@ -131,7 +133,7 @@
@PostMapping("/list")
public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) {
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class));
+ return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class));
}
/**
@@ -154,7 +156,7 @@
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return comEventService.pageByComEvent(comEvent, pagination);
+ return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
@@ -174,7 +176,7 @@
public R remove(@PathVariable Long id) {
ComEvent comEvent = new ComEvent();
comEvent.setId(id);
- comEvent.setEventProcessStatus(8);
+ comEvent.setEventProcessStatus(9);
return comEventService.updateComEvent(comEvent);
}
@@ -246,10 +248,12 @@
})
@PutMapping("/reject/Request")
public R rejectRequest(@RequestParam("id") Long id) {
- ComEvent comEvent = new ComEvent();
- comEvent.setId(id);
- comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode());
- return comEventService.updateComEvent(comEvent);
+ ComEvent comEvent = comEventService.getById(id);
+ comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
+ comEvent.setSpecialistName("待分配");
+ comEvent.setSpecialistId(null);
+ comEventService.updateEventStransferRecord(id);
+ return R.ok(comEventService.updateById(comEvent));
}
/**
@@ -312,7 +316,7 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- return comEventService.calculate();
+ return comEventService.calculate(getLoginUserInfo());
}
/**
@@ -332,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