From 4d6631a60975c8f6a0ec67436258bf54c8438dc1 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期日, 09 十月 2022 15:49:15 +0800
Subject: [PATCH] 事件状态修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 268742b..596ef70 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -80,7 +80,10 @@
             if (comEvent.getUserType().equals(1)){
                 comEvent.setRequestUserId(loginUserInfoVO.getUserId());
             }else if (comEvent.getUserType().equals(2)){
-                comEvent.setSpecialistId(loginUserInfoVO.getUserId());
+                ComSanshuoExpert expert = comSanShuoExpertService.getOne(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getPhone, loginUserInfoVO.getPhone()));
+                if (nonNull(expert)){
+                    comEvent.setSpecialistId(expert.getId());
+                }
             }
         }
         IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination);
@@ -196,7 +199,7 @@
         comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
         comEvent.setEventResult(comEventConciliationVO.getEventResult());
         comEvent.setReportSuperior(comEventConciliationVO.getReportSuperior());
-        if(comEventConciliationVO.getEventSucceed() ==2){
+        if(comEventConciliationVO.getEventSucceed().equals(2) || comEventConciliationVO.getEventSucceed().equals(1)){
             comEvent.setEventProcessStatus(6);
         }
         comEvent.setCurrentEventProcessResult(comEventConciliationVO.getCurrentEventProcessResult());
@@ -250,6 +253,7 @@
             comEvent.setUserEventStatus(4);
             comEvent.setEventProcessStatus(8);
             comEvent.setRevokeDes("用户手动取消");
+            comEvent.setRevokeDate(new Date());
             int flag = baseMapper.updateById(comEvent);
             return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
         } else {

--
Gitblit v1.7.1