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 | 91 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 19 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 64cb835..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
@@ -10,10 +10,10 @@
import com.panzhihua.common.constants.ReturnMsgConstants;
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.*;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
@@ -26,13 +26,11 @@
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.math.BigDecimal;
import java.util.*;
import static java.util.Objects.nonNull;
@@ -69,8 +67,19 @@
@Resource
private ComEventMapper comEventMapper;
+ @Resource
+ private UserService userService;
+
+ @Resource
+ 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());
@@ -79,13 +88,19 @@
List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent1.getId()));
List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
comEvent1.setImages(comEventRequestImageVO);
+// if (nonNull(userService.getUserInfoByUserId(comEvent1.getRequestUserId().toString()).getData().getImageUrl())){
+// comEvent1.setIcon(userService.getUserInfoByUserId(comEvent1.getRequestUserId().toString()).getData().getImageUrl());
+// }
+ ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
+ comEvent1.setEventCategoryName(category.getName());
});
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();
}
@@ -99,10 +114,14 @@
if (comEvent.getRequestUserCommunity() != null) {
ComActDO community = comActDAO.selectById(comEvent.getRequestUserCommunity());
comEvent.setCurrentOrgName(community.getName());
+ comEvent.setCurrentOrgId(community.getCommunityId().toString());
+ comEvent.setCurrentProcessType(2);
}
- if (comEvent.getCenterId() != null) {
+ if (!StringUtils.isEmpty(comEvent.getCenterId())) {
ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
comEvent.setCurrentOrgName(center.getName());
+ comEvent.setCurrentOrgId(center.getId().toString());
+ comEvent.setCurrentProcessType(1);
}
comEvent.setUserEventStatus(2);
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.UNDO.getCode());
@@ -119,12 +138,12 @@
if (!flag) {
return R.fail(ReturnMsgConstants.DATA_EXIST);
}
- saveEventImageList(comEvent.getImages(), comEvent.getId());
+ saveEventImageList(comEvent.getImages(), comEvent.getId(),null,1);
return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
}
@Transactional(rollbackFor = Exception.class)
- public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) {
+ public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id,Long transferId,Integer status) {
List<ComEventResource> comEventResourceList = new ArrayList<>();
if (!StringUtils.isEmpty(images)) {
List<ComEventRequestImageVO> imagesList = images;
@@ -132,7 +151,8 @@
ComEventResource comEventResource = new ComEventResource();
comEventResource.setId(Snowflake.getId());
comEventResource.setRefId(id);
- comEventResource.setStatus(1);
+ comEventResource.setTransferId(transferId);
+ comEventResource.setStatus(status);
comEventResource.setType(1);
comEventResource.setResourceName(comEventRequestImageVO.getName());
comEventResource.setResourceSize(comEventRequestImageVO.getSize());
@@ -147,9 +167,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R updateComEvent(ComEvent comEvent) {
- if (checkExist(comEvent.getOrderSn(), null)) {
+/* if (checkExist(comEvent.getOrderSn(), comEvent.getId())) {
return R.fail(ReturnMsgConstants.DATA_EXIST);
- }
+ }*/
int flag = baseMapper.updateById(comEvent);
return flag > 0 ? R.ok(comEvent, ReturnMsgConstants.UPDATE_SUCCESS) : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@@ -168,12 +188,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R conciliationEvent(ComEventConciliationVO comEventConciliationVO) {
- saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId());
+ public R conciliationEvent(ComEventConciliationVO comEventConciliationVO, LoginUserInfoVO loginUserInfo) {
+ saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId(),null,4);
ComEvent comEvent = baseMapper.selectById(comEventConciliationVO.getId());
comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
comEvent.setEventResult(comEventConciliationVO.getEventResult());
comEvent.setReportSuperior(comEventConciliationVO.getReportSuperior());
+ if(comEventConciliationVO.getEventSucceed() ==2){
+ comEvent.setEventProcessStatus(6);
+ }
comEvent.setCurrentEventProcessResult(comEventConciliationVO.getCurrentEventProcessResult());
//如果当前请求，需要上报上级进行处理
if (comEventConciliationVO.getReportSuperior()) {
@@ -194,6 +217,24 @@
}
}
int flag = baseMapper.updateById(comEvent);
+ ComEventTransferRecord comEventTransferRecord = new ComEventTransferRecord();
+ comEventTransferRecord.setEventId(comEvent.getId());
+ comEventTransferRecord.setSave(true);
+ comEventTransferRecord.setProcessResult(comEvent.getCurrentEventProcessResult());
+ comEventTransferRecord.setProcessResultData(new Date().toString());
+ comEventTransferRecord.setProcessDate(new Date());
+ comEventTransferRecord.setProcessBy(loginUserInfo.getUserId());
+ comEventTransferRecord.setProcessByName(loginUserInfo.getName());
+ comEventTransferRecord.setProcessType(1);
+ comEventTransferRecord.setCreateAt(new Date());
+ comEventTransferRecord.setSpecialistId(comEvent.getSpecialistId());
+ comEventTransferRecord.setSpecialistOrg(comEvent.getCurrentOrgId());
+ comEventTransferRecord.setSpecialistLevel(comEvent.getSpecialistLevel());
+ comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
+ comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
+ comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
+ saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
+ comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@@ -205,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);
@@ -221,12 +262,19 @@
ComEvent comEvent = baseMapper.selectById(id);
ComSanshuoExpert specter = comSanShuoExpertService.getById(comEvent.getSpecialistId());
CopyUtil.copyProperties(comEvent, comEventDetailVO);
- List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id));
+ 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);
comEventDetailVO.setImages(comEventRequestImageVO);
map.put("specter", specter);
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::getRefId, comEvent.getId()));
+ List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
+ comEventTransferRecord.setImages(ImageVO);
+ });
map.put("transferLog", transferRecord);
List<ComEventResource> resource = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
.eq(ComEventResource::getStatus, 5));
@@ -243,7 +291,7 @@
ComSanshuoExpert specter = comSanShuoExpertService.getById(specterId);
comEvent.setSpecialistAcceptTime(new Date());
comEvent.setSpecialistName(specter.getName());
- comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
+ comEvent.setEventProcessStatus(SanShuoEventStatusEnum.conciliation.getCode());
int flag = baseMapper.updateById(comEvent);
return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@@ -265,17 +313,22 @@
@Override
public R calculate() {
List<ComEventCalculateVO> calculateList = baseMapper.calculate();
+ ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
+ comEventCalculateVO.setStatus("0");
+ 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) {
ComEvent comEvent = baseMapper.selectById(comEventArchiveVO.getId());
if (comEvent.getEventSucceed() == 2) {
- comEvent.setEventProcessStatus(6);
+ comEvent.setEventProcessStatus(7);
} else {
- comEvent.setEventProcessStatus(5);
+ comEvent.setEventProcessStatus(6);
}
comEvent.setResult(comEventArchiveVO.getResult());
baseMapper.updateById(comEvent);
--
Gitblit v1.7.1