From c019d028e6522b67bc09ab4da29de4eff112568b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 11:31:51 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 1f0d48a..9bc3c24 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1415,6 +1415,21 @@
 
                 //查询事件流转记录
                 List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
+                if(!transferRecordList.isEmpty()){
+                    transferRecordList.forEach(transfer -> {
+                        if(transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)){
+                            //查询上级网格信息
+                            EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
+                            transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
+                                    + transferRecordDetailVO.getCommunityName() + "-" + transferRecordDetailVO.getGridName());
+                        }else if(transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)){
+                            //查询上级社区信息
+                            EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
+                            transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
+                                    + transferRecordDetailVO.getCommunityName());
+                        }
+                    });
+                }
                 statisticsVO.setTransferRecordList(transferRecordList);
             }
         }

--
Gitblit v1.7.1