烟台楼院小组功能修改

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java

@@ -82,4 +82,5 @@ public class YtTopicDetailResultDTO implements Serializable {
      * */
     private String oppositionCount;
     private String userName;
+    private String gridName;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java

@@ -31,6 +31,16 @@ public class YtTopicInfoResultDTO implements Serializable {
     private String releaseUserName;
     private String userName;
 
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
     /**
      * 发布人头像
      * */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java

@@ -218,6 +218,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
         } else {
             result.setVoteStatus(TopicConstant.NONE);
         }
+
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
+        if (null != gridInfo) {
+            result.setGridName(gridInfo.getGridNamePath());
+        }
+
         return result;
     }
 
@@ -257,6 +263,10 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
                 } else {
                     item.setReleaseUserFlag("other");
                 }
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (null != gridInfo) {
+                    item.setGridName(gridInfo.getGridNamePath());
+                }
                 //获取附件图片
                 LambdaQueryWrapper<YtTopicAttachmentEntity> imgWrapper = new LambdaQueryWrapper<>();
                 imgWrapper.eq(YtTopicAttachmentEntity::getTopicId, item.getTopicId());

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml

@@ -4,6 +4,7 @@
 <mapper namespace="com.epmet.modules.topic.dao.YtTopicDao">
     <select id="selectTopicList" resultType="com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO">
         SELECT ID           AS topicId,
+               GRID_ID,
                TOPIC_CONTENT,
                STATUS,
                USER_NAME,