From 0624e4109dc08524709be64e254496b6fb12fb21 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:15:05 +0800
Subject: [PATCH] 三说会堂bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 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 677872d..ed7a0a7 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
@@ -74,7 +74,12 @@
private CommediateTypeService commediateTypeService;
@Override
- public R pageByComEvent(ComEvent comEvent, Page pagination) {
+ 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());
+ }
IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination);
if (list.getRecords().size() < 1) {
return R.ok(Collections.emptyList());
@@ -92,9 +97,10 @@
return R.ok(list);
}
+
@Override
- public List<ComEvent> listByComEvent(ComEvent comEvent) {
- List<ComEvent> list = baseMapper.listByComEvent(comEvent);
+ public List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO) {
+ List<ComEvent> list = baseMapper.listByComEvent(comEvent,null);
if (list.size() < 1) {
return Collections.emptyList();
}
@@ -240,7 +246,7 @@
|| comEvent.getEventProcessStatus() == SanShuoEventStatusEnum.VALID.getCode().intValue()) {
comEvent.setId(id);
comEvent.setUserEventStatus(4);
- comEvent.setEventProcessStatus(SanShuoEventStatusEnum.CANCEL.getCode());
+ comEvent.setEventProcessStatus(8);
comEvent.setRevokeDes("用户手动取消");
int flag = baseMapper.updateById(comEvent);
return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
@@ -256,6 +262,7 @@
ComEvent comEvent = baseMapper.selectById(id);
ComSanshuoExpert specter = comSanShuoExpertService.getById(comEvent.getSpecialistId());
CopyUtil.copyProperties(comEvent, comEventDetailVO);
+ comEventDetailVO.setCategoryName(commediateTypeService.getById(comEventDetailVO.getEventCategory()).getName());
List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
.eq(ComEventResource::getStatus,1));
List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
@@ -264,7 +271,7 @@
map.put("eventDetail", comEventDetailVO);
List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id));
transferRecord.forEach(comEventTransferRecord -> {
- List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getTransferId, comEventTransferRecord.getId()));
+ List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()));
List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
comEventTransferRecord.setImages(ImageVO);
});
@@ -308,11 +315,12 @@
List<ComEventCalculateVO> calculateList = baseMapper.calculate();
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
- comEventCalculateVO.setSum(baseMapper.selectCount(new QueryWrapper<ComEvent>().lambda()).toString());
+ comEventCalculateVO.setSum(baseMapper.selectCount(new QueryWrapper<ComEvent>().lambda().notIn(ComEvent::getEventProcessStatus,(9))).toString());
calculateList.add(comEventCalculateVO);
return R.ok(calculateList);
}
+
@Override
@Transactional(rollbackFor = Exception.class)
public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
--
Gitblit v1.7.1