From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 16 ++++++++--------
1 files changed, 8 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 af1a971..c233b8a 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
@@ -4,7 +4,6 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
-import com.panzhihua.common.model.dtos.user.IndexDataDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
@@ -175,7 +174,7 @@
public R remove(@PathVariable Long id) {
ComEvent comEvent = new ComEvent();
comEvent.setId(id);
- comEvent.setEventProcessStatus(8);
+ comEvent.setEventProcessStatus(9);
return comEventService.updateComEvent(comEvent);
}
@@ -229,7 +228,7 @@
@ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
})
@PutMapping("/accept/Request")
- public R acceptRequest(@RequestParam("id") Long id,@RequestParam("specterId") Long specterId) {
+ public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
return comEventService.acceptRequest(id, specterId);
}
@@ -282,7 +281,7 @@
@ApiOperation("专家调解处理")
@PutMapping("/conciliation/Request")
public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
- return comEventService.conciliationEvent(comEventConciliationVO);
+ return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
}
/**
@@ -318,18 +317,19 @@
/**
* 大屏事件统计
+ *
* @param indexDataDTO 查询参数
- * */
+ */
@PostMapping("/indexData")
- public R indexData(@RequestBody IndexDateDTO indexDataDTO ){
+ public R indexData(@RequestBody IndexDateDTO indexDataDTO) {
return comEventService.indexData(indexDataDTO);
}
/**
* 大屏事件统计（事件和专家各级别占比）
- * */
+ */
@GetMapping("/indexData/event")
- public R eventIndexData(@RequestParam Integer type){
+ public R eventIndexData(@RequestParam Integer type) {
return comEventService.eventIndexData(type);
}
}
--
Gitblit v1.7.1