From 9384bdb69c6035eb3f0e405b70f97817f888655e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 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..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
@@ -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;
@@ -28,6 +27,8 @@
 import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
+
+import static java.util.Objects.isNull;
 
 /**
  * ClassName   ComEventController
@@ -132,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));
     }
 
     /**
@@ -155,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());
     }
 
 
@@ -175,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);
     }
 
@@ -229,7 +230,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);
     }
 
@@ -247,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));
     }
 
     /**
@@ -282,7 +285,7 @@
     @ApiOperation("专家调解处理")
     @PutMapping("/conciliation/Request")
     public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
-        return comEventService.conciliationEvent(comEventConciliationVO);
+        return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
     }
 
     /**
@@ -313,23 +316,42 @@
     @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
     @GetMapping("/status/calculate")
     public R calculate() {
-        return comEventService.calculate();
+        return comEventService.calculate(getLoginUserInfo());
     }
 
     /**
      * 大屏事件统计
+     *
      * @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);
     }
+
+
+    /**
+     *可选街道列表
+     * */
+    @GetMapping("/streetList")
+    public R getStreetId(){
+        return comEventService.listStreetScreen();
+    }
+
+    /**
+     *可选社区列表
+     * */
+    @GetMapping("/communityList")
+    public R getCommunityList(){
+        return comEventService.listCommunityScreen();
+    }
+
 }

--
Gitblit v1.7.1