From 78cd6f6cd83cf4a891c5b8aa7d023e3125a2698f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:59:49 +0800
Subject: [PATCH] 三说会堂事件流程处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java |   17 +++++++++++++----
 1 files changed, 13 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 1887ba0..5a20e0b 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 三说会堂事件表控制层
@@ -152,8 +154,12 @@
     })
     @PostMapping("/page")
     public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
+        log.info("==============分页参数"+comEventVO);
         Page pagination = new Page(pageNo, pageSize);
         ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
+        if (isNull(comEventVO.getUserType())){
+            comEvent.setUserType(comEventVO.getUsertype());
+        }
         return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
     }
 
@@ -246,10 +252,13 @@
     })
     @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);
+        comEvent.setSpecialistName("待分配");
+        comEvent.setSpecialistId(0L);
+        return R.ok(comEventService.updateById(comEvent));
     }
 
     /**

--
Gitblit v1.7.1