From f44383ff8edbc067ba3b85aba8dd8619990e6bdc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 09:25:33 +0800
Subject: [PATCH] =?UTF-8?q?/epmetuser/icresiuser/portrayal-list=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EgridId=E3=80=81gridName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/resi/ResiPortrayalDetailDTO.java    | 9 ++++++++-
 .../com/epmet/service/impl/IcResiUserServiceImpl.java    | 4 ++++
 .../src/main/resources/mapper/IcResiUserDao.xml          | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
index e002b95d5d..6d7f2b1a63 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
@@ -12,6 +12,14 @@ import lombok.Data;
  */
 @Data
 public class ResiPortrayalDetailDTO {
+
+    @ExcelIgnore
+    private String gridId;
+
+    @ExcelProperty(value = "所属网格")
+    @ColumnWidth(30)
+    private String gridName;
+
     /**
      * 居民id
      */
@@ -69,6 +77,5 @@ public class ResiPortrayalDetailDTO {
     @ColumnWidth(25)
     private String educationName;
 
-
 }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 97867f7508..dd5b44c54a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -4033,6 +4033,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         list.forEach(resi -> {
             // 学历名称
             resi.setEducationName(educationMap.get(resi.getEducationCode()));
+            GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId());
+            if (null != gridInfoCache) {
+                resi.setGridName(gridInfoCache.getGridNamePath());
+            }
         });
         PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index ec82b7ce45..ff5f663dc9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1601,7 +1601,8 @@
             u.CULTURE AS educationCode,
             '' AS educationName,
             IFNULL(u.CULTURE,'')AS educationCode,
-            u.BIRTHDAY AS birthday
+            u.BIRTHDAY AS birthday,
+            u.grid_id as gridId
         FROM
             ic_resi_user u
         WHERE