From e32462f977cb860413a4a4e64b7032b5c853a7c5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 13:35:20 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 1f32298..5373f25 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
@@ -76,10 +76,15 @@
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) {
- if (comEvent.getUserType().equals(1)){
- comEvent.setRequestUserId(loginUserInfoVO.getUserId());
- }else if (comEvent.getUserType().equals(2)){
- comEvent.setSpecialistId(loginUserInfoVO.getUserId());
+ if (nonNull(comEvent.getUserType())){
+ if (comEvent.getUserType().equals(1)){
+ comEvent.setRequestUserId(loginUserInfoVO.getUserId());
+ }else if (comEvent.getUserType().equals(2)){
+ 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);
if (list.getRecords().size() < 1) {
@@ -94,10 +99,10 @@
// }
ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
comEvent1.setEventCategoryName(category.getName());
+ comEvent1.setExpertAvatar(comSanShuoExpertService.getById(comEvent1.getSpecialistId()).getAvatar());
});
return R.ok(list);
}
-
@Override
public List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO) {
@@ -171,9 +176,14 @@
/* if (checkExist(comEvent.getOrderSn(), comEvent.getId())) {
return R.fail(ReturnMsgConstants.DATA_EXIST);
}*/
+ //清除专家信息
+ comEvent.setSpecialistId(null);
+ comEvent.setSpecialistName(null);
int flag = baseMapper.updateById(comEvent);
return flag > 0 ? R.ok(comEvent, ReturnMsgConstants.UPDATE_SUCCESS) : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
+
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -195,7 +205,7 @@
comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
comEvent.setEventResult(comEventConciliationVO.getEventResult());
comEvent.setReportSuperior(comEventConciliationVO.getReportSuperior());
- if(comEventConciliationVO.getEventSucceed() ==2){
+ if(comEventConciliationVO.getEventSucceed().equals(2)){
comEvent.setEventProcessStatus(6);
}
comEvent.setCurrentEventProcessResult(comEventConciliationVO.getCurrentEventProcessResult());
@@ -239,6 +249,7 @@
return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
+
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelRequest(Long id) {
@@ -249,6 +260,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