From 302d51ec3c223fd32c746d6bc163a840225b6f46 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 20:02:47 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 12 ++++++++++++
1 files changed, 12 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 dc38f93..e9e4320 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;
/**
@@ -98,6 +100,12 @@
eventVO.setAudios(audioList);
eventVO.setPics(picList);
eventVO.setVideos(videoList);
+
+ //查询网格员头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if(StringUtils.isNotEmpty(imageUrl)){
+ eventVO.setGridMemberImageUrl(imageUrl);
+ }
});
return R.ok(ipage);
}
@@ -156,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>()
--
Gitblit v1.7.1