From e4af2c23d23a0c002ad972a8f4a0ec775d926675 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 13 Dec 2021 16:30:11 +0800
Subject: [PATCH] =?UTF-8?q?resi/group/topic/gettopicdetail=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EgridName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ResiTopicIncludeIssueDetailResultDTO.java     | 3 +++
 .../modules/topic/service/impl/ResiTopicServiceImpl.java | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
index 2bce88383f..9af69706cd 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -90,4 +91,6 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      * 话题被屏蔽详情
      */
     private TopicHiddenDetailDTO hiddenDetail;
+
+    private String gridName;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 9e67dcd909..a41c97fc27 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -886,6 +886,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setReleaseAddress(topicDetail.getAddress());
         resultDTO.setTopicStatus(topicDetail.getStatus());
         resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue());
+        ResiGroupEntity resiGroupEntity=resiGroupDao.selectById(topicDetail.getGroupId());
+        if(null!=resiGroupEntity){
+            CustomerGridFormDTO customerGridFormDTO=new CustomerGridFormDTO();
+            customerGridFormDTO.setGridId(resiGroupEntity.getGridId());
+            Result<CustomerGridDTO> gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+            if(gridInfoRes.success()&&null!=gridInfoRes.getData()){
+                resultDTO.setGridName(gridInfoRes.getData().getGridNamePath());
+            }
+        }
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);