From 94e3a209bb9a31c4ddbd31494bb1628f6fe2e96e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:54:49 +0800
Subject: [PATCH] 新增首页工单 办事指南排行榜接口 导办人员排行榜接口 组织排行榜接口 新增办事指南统计接口 导办人员统计接口 组织胖行榜统计接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 87aa649..e7d55dd 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
@@ -171,11 +171,9 @@
*/
@Override
public R<EventDetailsVO> eventDetails(Long id) {
- EventDO eventDO = eventMapper.selectById(id);
- if (eventDO != null) {
- EventDetailsVO eventDetailsVO = new EventDetailsVO();
- BeanUtils.copyProperties(eventDO, eventDetailsVO);
- EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ EventDetailsVO eventDetailsVO = eventMapper.getById(id);
+ if (eventDetailsVO != null) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDetailsVO.getGridId());
if (eventGridDataDO != null) {
eventDetailsVO.setGridName(eventGridDataDO.getGridName());
eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
@@ -253,17 +251,17 @@
eventDetailsVO.setTrans(eventTransferRecordVOS);
// 查询网格员头像,姓名
- Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDetailsVO.getGridMemberId());
if (!CollectionUtils.isEmpty(gridMember)) {
eventDetailsVO.setGridMemberName(
gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
eventDetailsVO.setGridMemberImageUrl(
gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
}
- if (Objects.equals(eventDO.getGridMemberId(), eventDO.getCreateBy())) {
+ if (Objects.equals(eventDetailsVO.getGridMemberId(), eventDetailsVO.getCreateBy())) {
eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
} else {
- Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
+ Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDetailsVO.getCreateBy());
eventDetailsVO
.setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
}
@@ -1300,7 +1298,7 @@
@Override
public R<ComActVO> actList() {
- return communityService.listCommunityAll();
+ return communityService.listCommunityAll(null);
}
@Override
@@ -2671,7 +2669,6 @@
}
});
}
- statisticsVO.setGridIncidentList(eventResultList);
// 查询所有小区
List<CivilVillageStatisticsVO> villageStatisticsList =
this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
--
Gitblit v1.7.1