From 5d1e6dbb4a9abff2ef984058914b73e7f2ced736 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 20:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 73e221e..58332d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -49,6 +49,8 @@
private EventTransferRecordService eventTransferRecordService;
@Resource
private CommunityService communityService;
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
/**
@@ -162,6 +164,10 @@
eventDealStatus=6;//"已撤销"
}
eventDetailsVO.setEventDealStatus(eventDealStatus);
+
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+
//查询事件关联附件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -240,6 +246,13 @@
eventTransferRecordVOS.add(eventTransferRecordVO);
}
eventDetailsVO.setTrans(eventTransferRecordVOS);
+
+ //查询事件发布人头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
+ if(StringUtils.isNotEmpty(imageUrl)){
+ eventDetailsVO.setGridMemberImageUrl(imageUrl);
+ }
+
return R.ok(eventDetailsVO);
}
return R.fail();
--
Gitblit v1.7.1