From 166b1181d090cbc184c2a93bdb5b3db33da0758a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 23 九月 2022 18:27:02 +0800
Subject: [PATCH] [修改] 三说代码事件流程代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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..b9d27c1 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;
@@ -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