diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java
new file mode 100644
index 0000000000..e1d16b92d6
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java
@@ -0,0 +1,120 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see 
     */
     @PostMapping("getBuildingDetail/{buildingId}")
-    public Result getBuildingDetail(@PathVariable("buildingId") String buildingId){
+    public Result getBuildingDetail(@PathVariable("buildingId") String buildingId){
         return icBuildingService.getBuildingDetail(buildingId);
     }
 
@@ -82,7 +82,7 @@ public class HouseInformationController {
     * @return com.epmet.commons.tools.utils.Result
     */
     @PostMapping("getUnitDetail/{unitId}")
-    public Result getUnitDetail(@PathVariable("unitId") String unitId){
+    public Result getUnitDetail(@PathVariable("unitId") String unitId){
         return icBuildingUnitService.getUnitDetail(unitId);
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
index 3fd205a48d..a996255750 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@@ -196,4 +196,12 @@ public interface IcBuildingDao extends BaseDao {
      */
     Integer selectUnitCount(@Param("buildingId")String buildingId);
 
+    /**
+    * @describe: 获取楼栋详情
+    * @author wangtong
+    * @date 2022/6/28 16:16
+    * @params [buildingId]
+    * @return com.epmet.dto.result.IcBulidingDetailDTO
+    */
+    IcBulidingDetailDTO getBuildingDetail(@Param("buildingId") String buildingId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
index 147f25f7d2..ad5e8358a7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.HouseInfoResultDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -50,4 +51,12 @@ public interface IcBuildingUnitDao extends BaseDao {
      */
     void delUnit(@Param("ids")List ids);
 
-}
\ No newline at end of file
+    /**
+    * @describe: 获取单元详情
+    * @author wangtong
+    * @date 2022/6/28 17:03
+    * @params [unitId]
+    * @return com.epmet.dto.result.HouseInfoResultDTO
+    */
+    HouseInfoResultDTO getUnitDetail(@Param("unitId") String unitId);
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
index 038055aa6b..cde64d4da0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.result.IcBulidingDetailDTO;
 import com.epmet.entity.IcBuildingEntity;
 
 import java.util.List;
@@ -131,5 +132,5 @@ public interface IcBuildingService extends BaseService {
      * @params [buildingId]
      * @return com.epmet.commons.tools.utils.Result
      */
-    Result getBuildingDetail(String buildingId);
+    Result getBuildingDetail(String buildingId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
index 69538e3950..da966fbf6e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.dto.result.HouseInfoResultDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 
 import java.util.List;
@@ -121,5 +122,5 @@ public interface IcBuildingUnitService extends BaseService
      * @params [unitId]
      * @return com.epmet.commons.tools.utils.Result
      */
-    Result getUnitDetail(String unitId);
+    Result getUnitDetail(String unitId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
index 610e6f984b..9059a84eda 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.result.IcBulidingDetailDTO;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.service.IcBuildingService;
 import lombok.extern.slf4j.Slf4j;
@@ -168,8 +169,8 @@ public class IcBuildingServiceImpl extends BaseServiceImpl getBuildingDetail(String buildingId) {
-        return null;
+    public Result getBuildingDetail(String buildingId) {
+        return new Result().ok(baseDao.getBuildingDetail(buildingId));
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
index 2959397fdd..6b55f20cfd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
@@ -28,6 +28,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.dto.result.HouseInfoResultDTO;
+import com.epmet.dto.result.IcBulidingDetailDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 import com.epmet.service.IcBuildingUnitService;
 import lombok.extern.slf4j.Slf4j;
@@ -156,8 +158,8 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl getUnitDetail(String unitId) {
-        return null;
+    public Result getUnitDetail(String unitId) {
+        return new Result().ok(baseDao.getUnitDetail(unitId));
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 92c486f24a..c87edfccd5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -403,5 +403,30 @@
     
         SELECT COUNT(ID) FROM ic_building_unit WHERE BUILDING_ID = #{buildingId} AND DEL_FLAG = '0'
      
+    
+        SELECT
+            b.ID AS buildingId,
+            b.BUILDING_NAME,
+            b.NEIGHBOR_HOOD_ID,
+			b.sort,
+            b.TOTAL_UNIT_NUM,
+            b.TOTAL_FLOOR_NUM,
+            b.TOTAL_HOUSE_NUM,
+            h.NEIGHBOR_HOOD_NAME,
+			b.LATITUDE,
+			b.LONGITUDE,
+			b.TYPE,
+            h.GRID_ID,
+            h.AGENCY_ID,
+			b.BUILDING_LEADER_NAME,
+			b.BUILDING_LEADER_MOBILE,
+			b.CODING,
+			b.SYS_CODING,
+			b.REAL_PERSON
+        FROM ic_building b
+        INNER JOIN ic_neighbor_hood h ON (h.id = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
+        WHERE b.DEL_FLAG = '0'
+              AND b.ID = #{buildingId}
+     
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
index 09f334b42d..31b2e4873e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
@@ -17,6 +17,29 @@
     
         SELECT ID FROM ic_building_unit WHERE DEL_FLAG = '0' AND BUILDING_ID = #{buildingId} ORDER BY UNIT_NUM+0 DESC LIMIT #{size}
      
+    
+        SELECT bu.CUSTOMER_ID,
+			 h.AGENCY_ID,
+			 ca.ORGANIZATION_NAME as agencyName,
+			 CONCAT(ca.ALL_PARENT_NAME,'-',ca.ORGANIZATION_NAME) as agencyPathName,
+			 ca.AREA_CODE,
+			 h.GRID_ID,
+			 g.GRID_NAME,
+			 h.id as neighborHoodId,
+			 h.NEIGHBOR_HOOD_NAME,
+			 b.id as buildingId,
+			 b.BUILDING_NAME,
+			 bu.id as buildingUnitId,
+			 bu.UNIT_NAME
+
+        FROM ic_building_unit bu
+		INNER JOIN ic_building b ON (b.id = bu.BUILDING_ID AND b.DEL_FLAG = '0')
+        INNER JOIN ic_neighbor_hood h ON (h.id = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
+		INNER JOIN customer_agency ca ON (h.AGENCY_ID = ca.id AND ca.DEL_FLAG = '0')
+		INNER JOIN customer_grid g ON (h.GRID_ID = g.id AND g.DEL_FLAG = '0')
+        WHERE bu.DEL_FLAG = '0'
+          AND bu.ID = #{unitId}
+     
 
 
-
\ No newline at end of file
+