From a2dfc8c28ddba7cd9c51d47355be376ceb4d67b1 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Mon, 8 May 2023 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IcNeighborHoodDetailDTO.java   | 19 +++++++++++++++++++
 .../impl/IcNeighborHoodServiceImpl.java       | 17 +++++++++++++++++
 .../resources/mapper/IcNeighborHoodDao.xml    |  4 ++--
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodDetailDTO.java
index 2ed20afbfa..11bcd918c8 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodDetailDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodDetailDTO.java
@@ -107,5 +107,24 @@ public class IcNeighborHoodDetailDTO {
      * 二维码地址
      */
     private String qrcodeUrl;
+
+    private String viliageTypeName;
+
+    private String area;
+
+    private String openTypeName;
+
+    private String buildYear;
+
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 3b6a79691c..ff109d439b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -835,6 +835,23 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             result.setGridName(gridInfoCache.getGridName());
         }
         result.setPropertyList(propertyManagementDao.selectPropertyNameList(neighborhoodId));
+
+        if (StringUtils.isNotBlank(result.getOpenType())){
+            if (result.getOpenType().equals("1")){
+                result.setOpenTypeName("封闭式");
+            }
+            if (result.getOpenType().equals("2")){
+                result.setOpenTypeName("开放式");
+            }
+        }
+        if (StringUtils.isNotBlank(result.getViliageType())){
+            if (result.getViliageType().equals("1")){
+                result.setViliageTypeName("住宅小区");
+            }
+            if (result.getViliageType().equals("2")){
+                result.setViliageTypeName("自然村");
+            }
+        }
         return new Result<IcNeighborHoodDetailDTO>().ok(result);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index b61da5e7ab..fc9bee6bc7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -133,8 +133,8 @@
             a.LATITUDE as latitude,
             a.AREA as area,
             a.BUILD_YEAR as buildYear,
-            if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 1,'自然村','')) as viliageTypeName,
-            if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 1,'开放式','')) as openTypeName
+            if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 2,'自然村','')) as viliageTypeName,
+            if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 2,'开放式','')) as openTypeName
 
         from ic_neighbor_hood a
         left join customer_agency b  on a.AGENCY_ID = b.ID and b.DEL_FLAG='0'