From 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:04 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 4e2c998..677872d 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
@@ -70,6 +70,9 @@
@Resource
private UserService userService;
+ @Resource
+ private CommediateTypeService commediateTypeService;
+
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination) {
IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination);
@@ -80,7 +83,11 @@
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);
- comEvent1.setIcon(userService.getUserInfoByUserId(comEvent1.getRequestUserId().toString()).getData().getImageUrl());
+// 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);
}
@@ -101,10 +108,14 @@
if (comEvent.getRequestUserCommunity() != null) {
ComActDO community = comActDAO.selectById(comEvent.getRequestUserCommunity());
comEvent.setCurrentOrgName(community.getName());
+ comEvent.setCurrentOrgId(community.getCommunityId().toString());
+ comEvent.setCurrentProcessType(2);
}
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());
@@ -273,7 +284,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);
}
@@ -307,9 +318,9 @@
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