From e0b90c355f71dbf527c8f42f57e5f361b4430385 Mon Sep 17 00:00:00 2001
From: lzh <small_lzh@outlook.com>
Date: Fri, 29 Oct 2021 09:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=EF=BC=8C=E6=A5=BC=E5=AE=87?=
 =?UTF-8?q?=EF=BC=8C=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/BuildingTreeLevelDTO.java   |  52 +++
 .../java/com/epmet/dto/IcBuildingDTO.java     |   1 +
 .../com/epmet/dto/form/IcBulidingFormDTO.java | 119 +++++++
 .../com/epmet/dto/form/IcHouseFormDTO.java    | 101 ++++++
 .../dto/form/ListIcNeighborHoodFormDTO.java   |  21 +-
 epmet-module/gov-org/gov-org-server/pom.xml   |  11 +
 .../epmet/controller/BuildingController.java  | 115 +++++++
 .../com/epmet/controller/HouseController.java |  97 ++++++
 .../controller/NeighborHoodController.java    | 113 +++++--
 .../java/com/epmet/dao/IcBuildingDao.java     |  31 +-
 .../main/java/com/epmet/dao/IcHouseDao.java   |  26 +-
 .../java/com/epmet/dao/IcNeighborHoodDao.java |  13 +-
 .../java/com/epmet/excel/IcBuildingExcel.java | 121 +++++++
 .../java/com/epmet/excel/IcHouseExcel.java    | 139 ++++++++
 .../com/epmet/excel/IcNeighborHoodExcel.java  | 123 ++++++++
 .../java/com/epmet/redis/IcBuildingRedis.java |  47 +++
 .../java/com/epmet/redis/IcHouseRedis.java    |  47 +++
 .../com/epmet/redis/IcNeighborHoodRedis.java  |  47 +++
 .../com/epmet/service/BuildingService.java    |  53 ++++
 .../java/com/epmet/service/HouseService.java  |  47 +++
 .../epmet/service/NeighborHoodService.java    |  13 +
 .../service/impl/BuildingServiceImpl.java     | 296 ++++++++++++++++++
 .../epmet/service/impl/HouseServiceImpl.java  | 152 +++++++++
 .../service/impl/NeighborHoodServiceImpl.java | 268 ++++++++++++++--
 .../java/com/epmet/util/ExcelPoiUtils.java    | 276 ++++++++++++++++
 .../src/main/resources/bootstrap.yml          |   2 +
 .../resources/excel/building_template.xlsx    | Bin 0 -> 11756 bytes
 .../main/resources/excel/house_template.xlsx  | Bin 0 -> 11445 bytes
 .../resources/excel/neighbor_template.xlsx    | Bin 0 -> 11674 bytes
 .../main/resources/mapper/IcBuildingDao.xml   | 228 ++++++++++++++
 .../src/main/resources/mapper/IcHouseDao.xml  | 196 ++++++++++++
 .../resources/mapper/IcNeighborHoodDao.xml    | 117 ++++++-
 32 files changed, 2806 insertions(+), 66 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcBuildingRedis.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcNeighborHoodRedis.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ExcelPoiUtils.java
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java
new file mode 100644
index 0000000000..3d7da25047
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class BuildingTreeLevelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private String id;
+
+	private String pId;
+
+	private String label;
+
+
+	private String level;
+
+	private List<BuildingTreeLevelDTO> children;
+
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java
index 61eba8fd2e..4d9aa11d17 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java
@@ -59,6 +59,7 @@ public class IcBuildingDTO implements Serializable {
      */
 	private String buildingName;
 
+
     /**
      * 楼栋类型，这里存储字典编码就可以
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java
new file mode 100644
index 0000000000..da2b08fc09
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class IcBulidingFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface DeleteGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "楼栋ID不能为空", groups = { UpdateGroup.class,DeleteGroup.class})
+    private String buildingId;
+
+    /**
+     * 组织id
+     */
+    @NotBlank(message = "组织id不能为空", groups = {AddGroup.class})
+    private String agencyId;
+
+
+    /**
+     * 网格id
+     */
+
+    private String gridId;
+
+
+    /**
+     * 小区id
+     */
+    @NotBlank(message = "小区id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String neighborHoodId;
+
+    /**
+     * 楼栋名称
+     */
+    @NotBlank(message = "楼栋名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @Length(max=10,message = "楼栋名称不能超过10个字", groups = {AddGroup.class, UpdateGroup.class})
+	private String buildingName;
+
+    /**
+     * 客户id
+     */
+   /* @NotBlank(message = "客户id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String customerId;*/
+
+    /**
+     * 排序
+     */
+    @NotBlank(message = "排序不能为空", groups = { UpdateGroup.class})
+    private Integer sort = 0;
+
+    /**
+     * 总单元数
+     */
+    @NotBlank(message = "总单元数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private Integer totalUnitNum=1;
+
+    /**
+     * 总楼层总数
+     */
+    @NotBlank(message = "总楼层总数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private Integer totalFloorNum;
+
+    /**
+     * 总户数
+     */
+    @NotBlank(message = "总户数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private Integer totalHouseNum;
+    /**
+     * 坐标位置
+     */
+    @NotBlank(message = "坐标位置不能为空", groups = { UpdateGroup.class})
+    private String location;
+
+
+    /**
+     * 中心点位：经度
+     */
+    @NotBlank(message = "经度不能为空", groups = {UpdateGroup.class})
+    private String longitude;
+
+    /**
+     * 中心点位：纬度
+     */
+    @NotBlank(message = "维度不能为空", groups = {UpdateGroup.class})
+    private String latitude;
+
+
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
new file mode 100644
index 0000000000..022a34ad6e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class IcHouseFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface DeleteGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "房屋ID不能为空", groups = { UpdateGroup.class,DeleteGroup.class})
+    private String houseId;
+
+
+    /**
+     * 小区id
+     */
+    @NotBlank(message = "小区id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String neighborHoodId;
+
+    @NotBlank(message = "所属楼栋ID不能为空", groups = { UpdateGroup.class})
+    private String belongBuildingId;
+
+    /**
+     * 所属单元id
+     */
+    @NotBlank(message = "所属单元id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String buildingUnitId;
+
+
+
+    /**
+     * 门牌号
+     */
+    @NotBlank(message = "门牌号不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+    @NotBlank(message = "房屋类型不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String houseType;
+
+    /**
+     * 存储字典value
+     */
+    @NotBlank(message = "房屋用途不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String purpose;
+
+    /**
+     * 1出租；0未出租
+     */
+    @NotBlank(message = "是否出租不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private Boolean rentFlag;
+
+    /**
+     * 房主姓名
+     */
+    @NotBlank(message = "房主姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    @NotBlank(message = "房主电话不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+    @NotBlank(message = "房主身份证号不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String ownerIdCard;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
index 49839dfe4a..3e7eecf9b8 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
@@ -31,22 +31,29 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
      * */
     private Integer pageSize = 20;
 
+    /**
+     * 组织类别
+     */
+    private String level ;
+
+    private String id;
+
     /**
      * 组织ID
      */
-    private String  agencyId;
+//    private String  agencyId;
     /**
      * 网格ID
      */
-    private String  gridId;
+//    private String  gridId;
     /**
      * 小区名字
      */
-    private String  neighborHoodName;
+//    private String  neighborHoodName;
     /**
      * 楼栋名字
      */
-    private String  buildingName;
+//    private String  buildingName;
     /**
      * 房主姓名
      */
@@ -59,15 +66,15 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
      * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】
      */
 //    @Pattern(regexp = "^(neighbourHood|building|house)?$",message = "数据类型选择错误")
-    private String  dataType;
+//    private String  dataType;
     /**
      * 楼栋ID
      */
-    private String  buildingId;
+//    private String  buildingId;
     /**
      * 小区ID
      */
-    private String  neighborHoodId;
+//    private String  neighborHoodId;
 
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 13561a58a3..ccbc334ede 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -129,8 +129,19 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
 
+
         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
new file mode 100644
index 0000000000..632f57fd3f
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.BuildingTreeLevelDTO;
+import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.dto.form.IcNeighborHoodFormDTO;
+import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.excel.IcNeighborHoodExcel;
+import com.epmet.service.BuildingService;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcNeighborHoodService;
+import com.epmet.service.NeighborHoodService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Slf4j
+@RestController
+@RequestMapping("building")
+public class BuildingController {
+    
+
+    @Autowired
+    private NeighborHoodService neighborHoodService;
+
+    @Autowired
+    private IcBuildingService icBuildingService;
+    @Autowired
+    private BuildingService buildingService;
+
+
+
+    @PostMapping("buildinglist")
+    public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class);
+        IcNeighborHoodResultDTO icNeighborHoodResultDTO = neighborHoodService.listNeighborhood(formDTO);
+        return new Result().ok(icNeighborHoodResultDTO);
+
+    }
+
+    @PostMapping("buildingadd")
+    public Result buildingAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
+
+        buildingService.AddBuilding(customerId,formDTO);
+        return new Result().ok("保存成功");
+    }
+
+    @PostMapping("buildingupdate")
+    public Result buildingUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+        String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
+        buildingService.UpdateBuilding(customerId,formDTO);
+        return new Result().ok("修改成功");
+    }
+
+    @PostMapping("buildingdel")
+    public Result buildingDel(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class);
+        String buildingId = formDTO.getBuildingId();
+        buildingService.DelBuilding(buildingId);
+        return new Result();
+    }
+
+    @PostMapping("treelist")
+    public Result treeList(@LoginUser TokenDto tokenDTO){
+        List<BuildingTreeLevelDTO> buildingTreeLevelDTOS =buildingService.treeList(tokenDTO.getUserId());
+        return new Result().ok(buildingTreeLevelDTOS);
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
new file mode 100644
index 0000000000..82eb115b44
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.form.IcHouseFormDTO;
+import com.epmet.dto.form.IcNeighborHoodFormDTO;
+import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.service.HouseService;
+import com.epmet.service.NeighborHoodService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 房屋表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Slf4j
+@RestController
+@RequestMapping("house")
+public class HouseController {
+    
+
+    @Autowired
+    private NeighborHoodService neighborHoodService;
+
+    @Autowired
+    private HouseService houseService;
+
+
+    @PostMapping("houselist")
+    public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class);
+        IcNeighborHoodResultDTO icNeighborHoodResultDTO = neighborHoodService.listNeighborhood(formDTO);
+        return new Result().ok(icNeighborHoodResultDTO);
+
+    }
+
+    @PostMapping("houseadd")
+    public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
+
+        houseService.addHouse(customerId,formDTO);
+        return new Result();
+    }
+
+    @PostMapping("houseupdate")
+    public Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+        String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
+        houseService.updateHouse(customerId,formDTO);
+        return new Result();
+    }
+
+    @PostMapping("housedel")
+    public Result houseDel(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.DeleteGroup.class);
+        houseService.delHouse(formDTO.getHouseId());
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
index bde7b11c0c..97aa10b5b8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
@@ -17,24 +17,40 @@
 
 package com.epmet.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.constant.NeighborhoodConstant;
 import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.excel.IcBuildingExcel;
+import com.epmet.excel.IcHouseExcel;
+import com.epmet.excel.IcNeighborHoodExcel;
+import com.epmet.service.BuildingService;
+import com.epmet.service.HouseService;
 import com.epmet.service.IcNeighborHoodService;
 import com.epmet.service.NeighborHoodService;
+import com.epmet.util.ExcelPoiUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -44,6 +60,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-10-25
  */
+@Slf4j
 @RestController
 @RequestMapping("neighborhood")
 public class NeighborHoodController {
@@ -52,6 +69,10 @@ public class NeighborHoodController {
     private IcNeighborHoodService icNeighborHoodService;
     @Autowired
     private NeighborHoodService neighborHoodService;
+    @Autowired
+    private BuildingService buildingService;
+    @Autowired
+    private HouseService houseService;
 
 
 
@@ -70,6 +91,7 @@ public class NeighborHoodController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, AddGroup.class);
         String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
 
         neighborHoodService.AddNeighborhood(customerId,formDTO);
         return new Result();
@@ -80,6 +102,7 @@ public class NeighborHoodController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
         String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
         neighborHoodService.UpdateNeighborhood(customerId,formDTO);
         return new Result();
     }
@@ -94,40 +117,62 @@ public class NeighborHoodController {
     }
 
 
-    @GetMapping("page")
-    public Result<PageData<IcNeighborHoodDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcNeighborHoodDTO> page = icNeighborHoodService.page(params);
-        return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
-    }
+    /**
+     * 导出
+     * @param formDTO
+     * @param response
+     * @throws Exception
+     */
+    @RequestMapping("exportneighborhoodinfo")
+    public void exportneighborhoodinfo(@RequestBody ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class);
+        neighborHoodService.exportNeighborhoodinfo(formDTO,response);
 
-    @GetMapping("{id}")
-    public Result<IcNeighborHoodDTO> get(@PathVariable("id") String id){
-        IcNeighborHoodDTO data = icNeighborHoodService.get(id);
-        return new Result<IcNeighborHoodDTO>().ok(data);
     }
 
-    @PostMapping
-    public Result save(@RequestBody IcNeighborHoodDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icNeighborHoodService.save(dto);
-        return new Result();
-    }
 
-    @PutMapping
-    public Result update(@RequestBody IcNeighborHoodDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icNeighborHoodService.update(dto);
-        return new Result();
-    }
 
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icNeighborHoodService.delete(ids);
-        return new Result();
+//    /**
+//     * 导入
+//     * @param params
+//     * @param response
+//     * @throws Exception
+//     */
+//    @PostMapping("importneighborhoodinfo")
+//    public void importneighborhoodinfo(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+//        List<IcNeighborHoodDTO> list = icNeighborHoodService.list(params);
+//        ExcelUtils.exportExcelToTarget(response, "小区信息录入表", list, IcNeighborHoodExcel.class);
+////        ExcelUtils.expor
+//    }
+
+    /**
+     * 导入数据
+     * @param file
+     * @return
+     * @throws IOException
+     */
+    @PostMapping("importneighborhoodinfo")
+    public Result importExcel(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file, HttpServletRequest request) throws IOException {
+        String dataType = request.getParameter("dataType");
+        if(StringUtils.isEmpty(dataType)){
+            return new Result().error(ErrorCode.PASSWORD_ERROR);
+        }
+        String customerId = tokenDTO.getCustomerId();
+//        String customerId = "123123";
+        if(NeighborhoodConstant.NEIGHBOR_HOOD.equals(dataType)){
+            List<IcNeighborHoodExcel> result = ExcelPoiUtils.importExcel(file, 0, 1, IcNeighborHoodExcel.class);
+            neighborHoodService.importExcel(customerId,result);
+        }else if(NeighborhoodConstant.BUILDING.equals(dataType)){
+            List<IcBuildingExcel> result = ExcelPoiUtils.importExcel(file, 0, 1, IcBuildingExcel.class);
+            buildingService.importExcel(customerId,result);
+        }else if(NeighborhoodConstant.HOUSE.equals(dataType)){
+            List<IcHouseExcel> result = ExcelPoiUtils.importExcel(file, 0, 1, IcHouseExcel.class);
+            houseService.importExcel(customerId,result);
+        }
+        return new Result().ok("导入成功");
     }
 
+
+
+
 }
\ No newline at end of file
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 d800bb6761..becb5ad1b8 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
@@ -17,9 +17,20 @@
 
 package com.epmet.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
+import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.excel.IcBuildingExcel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 楼栋信息
@@ -29,5 +40,23 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
-	
+
+//    IPage<Map<String, Object>> searchBuildingByPage(IPage<IcBuildingEntity> page,
+//                                                    @Param("neighbor") IcNeighborHoodEntity neighbor,
+//                                                    @Param("building")IcBuildingEntity  building);
+    IPage<Map<String, Object>> searchBuildingByPage(IPage<IcBuildingEntity> page,
+                                                    @Param("building")IcBuildingEntity  building);
+
+//    List<IcBuildingExcel> searchAllBuilding(@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper,
+//                                                  @Param("ew1") QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper);
+//    List<IcBuildingExcel> searchAllBuilding(@Param("neighbor") IcNeighborHoodEntity neighbor,
+//                                            @Param("building")IcBuildingEntity  building);
+    List<IcBuildingExcel> searchAllBuilding(
+                                            @Param("building")IcBuildingEntity  building);
+
+    List<CustomerAgencyEntity> selectAgencyChildrenList(@Param("agencyId") String agencyId);
+
+    List<Map<String, Object>> selectListByName(@Param("neighborNameList")ArrayList<String> strings,
+                                               @Param("buildingNameList") ArrayList<String> strings1,
+                                               @Param("buildingUnitList") ArrayList<Integer> integers);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index e8c196935d..929a8ab570 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -17,9 +17,19 @@
 
 package com.epmet.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcBuildingEntity;
 import com.epmet.entity.IcHouseEntity;
+import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.excel.IcHouseExcel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 房屋信息
@@ -29,5 +39,19 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcHouseDao extends BaseDao<IcHouseEntity> {
-	
+
+//    IPage<Map<String, Object>> searchHouseByPage(IPage<IcHouseEntity> page,
+//                                                 @Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper,
+//                                                 @Param("ew1") QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper,
+//                                                 @Param("ew2") QueryWrapper<IcHouseEntity> houseEntityQueryWrapper);
+//    IPage<Map<String, Object>> searchHouseByPage(IPage<IcHouseEntity> page,
+//                                                 @Param("neighbor") IcNeighborHoodEntity neighbor,
+//                                                 @Param("building") IcBuildingEntity building,
+//                                                 @Param("house") IcHouseEntity house);
+    IPage<Map<String, Object>> searchHouseByPage(IPage<IcHouseEntity> page,
+                                                 @Param("house") IcHouseEntity house);
+
+    List<IcHouseExcel> searchAllHouse(@Param("neighbor") IcNeighborHoodEntity neighbor,
+                                      @Param("building") IcBuildingEntity building,
+                                      @Param("house") IcHouseEntity house);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index 9616584401..919cd34707 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -22,10 +22,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.excel.IcNeighborHoodExcel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 小区表
@@ -36,5 +39,13 @@ import java.util.Map;
 @Mapper
 public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
 
-    IPage<Map<String, Object>> searchNeighborhoodByPage(IPage<IcNeighborHoodEntity> page,@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
+//    IPage<Map<String, Object>> searchNeighborhoodByPage(IPage<IcNeighborHoodEntity> page,@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
+    IPage<Map<String, Object>> searchNeighborhoodByPage(IPage<IcNeighborHoodEntity> page,@Param("neighbor") IcNeighborHoodEntity neighbor);
+
+//    List<IcNeighborHoodExcel> searchAllNeighborhood(@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
+    List<IcNeighborHoodExcel> searchAllNeighborhood(@Param("neighbor") IcNeighborHoodEntity neighbor);
+
+    List<IcNeighborHoodEntity> selectListByName(@Param("neighborNameList")List<String> neighborNameList,
+                                                @Param("agencyNameList") List<String> agencyNameList,
+                                                @Param("gridNameList") List<String> gridNameList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java
new file mode 100644
index 0000000000..230f8d26e0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Data
+public class IcBuildingExcel {
+
+    /*@Excel(name = "楼栋主键")
+    private String id;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "小区id")
+    private String neighborHoodId;
+
+    @Excel(name = "片区id，neighbor_hood_part.id,可为空。")
+    private String partId;
+
+    @Excel(name = "楼栋名称")
+    private String buildingName;
+
+    @Excel(name = "楼栋类型，这里存储字典编码就可以")
+    private String type;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "总单元数")
+    private Integer totalUnitNum;
+
+    @Excel(name = "总楼层总数")
+    private Integer totalFloorNum;
+
+    @Excel(name = "总户数")
+    private Integer totalHouseNum;
+
+    @Excel(name = "中心点位：经度")
+    private String longitude;
+
+    @Excel(name = "中心点位：纬度")
+    private String latitude;
+
+    @Excel(name = "坐标位置")
+    private String coordinatePosition;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;*/
+
+    @Excel(name = "所属组织")
+    @NotBlank(message = "所属组织不能位空")
+    private String agencyName;
+
+    @Excel(name = "所属网格")
+    @NotBlank(message = "所属网格不能位空")
+    private String gridName;
+
+    @Excel(name = "小区名称")
+    @NotBlank(message = "小区名称不能位空")
+    @Length(max=50,message = "小区名称不能超过50个字")
+    private String neighborHoodName;
+
+    @Excel(name = "楼栋名称")
+    @NotBlank(message = "楼栋名称不能位空")
+    private String buildingName;
+
+    @Excel(name = "单元数")
+    @NotBlank(message = "单元数不能位空")
+    private Integer totalUnitNum;
+
+    @Excel(name = "层数")
+    @NotBlank(message = "层数不能位空")
+    private Integer totalFloorNum;
+
+    @Excel(name = "户数")
+    @NotBlank(message = "户数不能位空")
+    private Integer totalHouseNum;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java
new file mode 100644
index 0000000000..d51725fd6e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java
@@ -0,0 +1,139 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Data
+public class IcHouseExcel {
+
+    /*@Excel(name = "房屋主键")
+    private String id;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "小区id")
+    private String neighborHoodId;
+
+    @Excel(name = "片区id，neighbor_hood_part.id,可为空。")
+    private String partId;
+
+    @Excel(name = "所属楼栋id")
+    private String buildingId;
+
+    @Excel(name = "所属单元id")
+    private String buildingUnitId;
+
+    @Excel(name = "房屋名字后台插入时生成")
+    private String houseName;
+
+    @Excel(name = "门牌号")
+    private String doorName;
+
+    @Excel(name = "房屋类型，这里存储字典value就可以")
+    private String houseType;
+
+    @Excel(name = "存储字典value")
+    private String purpose;
+
+    @Excel(name = "1出租；0未出租")
+    private Integer rentFlag;
+
+    @Excel(name = "房主姓名")
+    private String ownerName;
+
+    @Excel(name = "房主电话")
+    private String ownerPhone;
+
+    @Excel(name = "房主身份证号")
+    private String ownerIdCard;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;*/
+
+
+
+    @Excel(name = "小区名称")
+    @NotBlank(message = "小区名称不能位空")
+    @Length(max=50,message = "小区名称不能超过50个字")
+    private String neighborHoodName;
+
+    @Excel(name = "楼栋名称")
+    @NotBlank(message = "楼栋名称不能位空")
+    private String buildingName;
+
+    @Excel(name = "单元号")
+    @NotBlank(message = "单元号不能位空")
+    private Integer buildingUnit;
+
+    @Excel(name = "门牌号")
+    @NotBlank(message = "门牌号不能位空")
+    private String doorName;
+
+    @Excel(name = "房屋类型")
+    @NotBlank(message = "房屋类型不能位空")
+    private String houseType;
+
+    @Excel(name = "房屋用途")
+    @NotBlank(message = "房屋用途不能位空")
+    private String purpose;
+
+    @Excel(name = "出租")
+    @NotBlank(message = "出租不能位空")
+    private String rentFlag;
+
+    @Excel(name = "房主姓名")
+    @NotBlank(message = "房主姓名不能位空")
+    private String ownerName;
+
+    @Excel(name = "房主电话")
+    @NotBlank(message = "房主电话不能位空")
+    private String ownerPhone;
+
+    @Excel(name = "房主身份证号")
+    @NotBlank(message = "房主身份证号不能位空")
+    private String ownerIdCard;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
new file mode 100644
index 0000000000..2926485139
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcNeighborHoodExcel {
+
+    /*@Excel(name = "小区主键")
+    private String id;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "小区名称")
+    private String neighborHoodName;
+
+    @Excel(name = "组织id")
+    private String agencyId;
+
+    @Excel(name = "上级组织id")
+    private String parentAgencyId;
+
+    @Excel(name = "组织的所有上级组织id")
+    private String agencyPids;
+
+    @Excel(name = "网格id")
+    private String gridId;
+
+    @Excel(name = "详细地址")
+    private String address;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "中心点位：经度")
+    private String longitude;
+
+    @Excel(name = "中心点位：纬度")
+    private String latitude;
+
+    @Excel(name = "坐标区域")
+    private String coordinates;
+
+    @Excel(name = "坐标位置")
+    private String location;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;*/
+
+
+
+
+    @Excel(name = "所属组织")
+    @NotBlank(message = "所属组织不能位空")
+    private String agencyName;
+
+    @Excel(name = "所属网格")
+    @NotBlank(message = "所属网格不能位空")
+    private String gridName;
+
+    @Excel(name = "小区名称")
+    @NotBlank(message = "小区名称不能位空")
+    @Length(max=50,message = "小区名称不能超过50个字")
+    private String neighborHoodName;
+
+    @Excel(name = "关联物业")
+
+    private String propertyName;
+
+    @Excel(name = "详细地址")
+    @NotBlank(message = "详细地址不能位空")
+    private String address;
+
+    @Excel(name = "备注")
+    @Length(max=500,message = "备注不能超过500个字")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcBuildingRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcBuildingRedis.java
new file mode 100644
index 0000000000..976590a3ae
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcBuildingRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Component
+public class IcBuildingRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
new file mode 100644
index 0000000000..9159c6eb88
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Component
+public class IcHouseRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcNeighborHoodRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcNeighborHoodRedis.java
new file mode 100644
index 0000000000..9de1516e7f
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcNeighborHoodRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Component
+public class IcNeighborHoodRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
new file mode 100644
index 0000000000..8cdad17d3e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.dto.BuildingTreeLevelDTO;
+import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.excel.IcBuildingExcel;
+import com.epmet.excel.IcNeighborHoodExcel;
+
+import java.util.List;
+
+/**
+ * 楼栋
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface BuildingService {
+
+
+
+
+
+    void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO);
+
+    /**
+     * 删除小区
+     * @param buildingId
+     */
+    void DelBuilding(String buildingId);
+
+
+    void AddBuilding(String customerId, IcBulidingFormDTO formDTO);
+
+    List<BuildingTreeLevelDTO> treeList(String customerId);
+
+    void importExcel(String customerId, List<IcBuildingExcel> list);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
new file mode 100644
index 0000000000..258c8c020d
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.dto.form.IcHouseFormDTO;
+import com.epmet.excel.IcHouseExcel;
+import com.epmet.excel.IcNeighborHoodExcel;
+
+import java.util.List;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface HouseService {
+
+    void addHouse(String customerId, IcHouseFormDTO formDTO);
+
+
+    void updateHouse(String customerId, IcHouseFormDTO formDTO);
+
+    /**
+     * 删除小区
+     * @param houseId
+     */
+    void delHouse(String houseId);
+
+
+    void importExcel(String customerId, List<IcHouseExcel> list);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
index 7b25482b6a..f4c612a2b4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
@@ -20,6 +20,10 @@ package com.epmet.service;
 import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.excel.IcNeighborHoodExcel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 小区表
@@ -40,4 +44,13 @@ public interface NeighborHoodService{
      * @param neighborHoodId
      */
     void DelNeighborhood(String neighborHoodId);
+
+    /**
+     * 导出数据
+     * @param formDTO
+     * @param response
+     */
+    void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception ;
+
+    void importExcel(String customerId,List<IcNeighborHoodExcel> list);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
new file mode 100644
index 0000000000..2ae7a5ac42
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -0,0 +1,296 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.*;
+import com.epmet.dto.*;
+import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.dto.result.ExtStaffPermissionResultDTO;
+import com.epmet.entity.*;
+import com.epmet.excel.IcBuildingExcel;
+import com.epmet.excel.IcNeighborHoodExcel;
+import com.epmet.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class BuildingServiceImpl implements BuildingService {
+
+
+    @Autowired
+    private IcBuildingService icBuildingService;
+    @Resource
+    private IcBuildingDao icBuildingDao;
+
+    @Autowired
+    private IcBuildingUnitService icBuildingUnitService;
+
+    @Resource
+    private IcHouseDao icHouseDao;
+    @Autowired
+    private IcHouseService icHouseService;
+
+    @Resource
+    private CustomerAgencyDao customerAgencyDao;
+    @Resource
+    private CustomerGridDao customerGridDao;
+    @Resource
+    private IcNeighborHoodDao icNeighborHoodDao;
+    @Resource
+    private CustomerStaffAgencyDao customerStaffAgencyDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) {
+        IcBuildingDTO icBuildingDTO= ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
+        icBuildingDTO.setCustomerId(customerId);
+        IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
+        icBuildingDao.insert(entity);
+
+        //设置楼宇单元
+        Integer totalUnitNum = formDTO.getTotalUnitNum();
+        List<IcBuildingUnitEntity> unitList = new ArrayList<>();
+        for(int i =0 ;i<totalUnitNum;i++){
+            IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
+            icBuildingUnit.setBuildingId(entity.getId());
+            icBuildingUnit.setUnitName(String.valueOf(i+1));
+            icBuildingUnit.setUnitNum(String.valueOf(i+1));
+            unitList.add(icBuildingUnit);
+        }
+        icBuildingUnitService.insertBatch(unitList);
+
+    }
+
+    @Override
+    public List<BuildingTreeLevelDTO> treeList(String staffId) {
+        CustomerStaffAgencyDTO agency = customerStaffAgencyDao.selectLatestCustomerByStaff(staffId);
+        if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
+            log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
+            return new ArrayList<>();
+        }
+        //1.获取所在组织及下级组织
+        CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId());
+        List<CustomerAgencyEntity> customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId());
+        customerAgencyList.add(customerAgency);
+
+        if(CollectionUtils.isEmpty(customerAgencyList)){
+            return new ArrayList<>();
+        }
+
+        List<BuildingTreeLevelDTO> agencyList = customerAgencyList.stream().map(item -> {
+            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+            buildingTreeLevelDTO.setId(item.getId());
+            buildingTreeLevelDTO.setPId(item.getPid());
+            buildingTreeLevelDTO.setLabel(item.getOrganizationName());
+            buildingTreeLevelDTO.setLevel(item.getLevel());
+            buildingTreeLevelDTO.setChildren(new ArrayList<>());
+            return buildingTreeLevelDTO;
+        }).collect(Collectors.toList());
+
+
+
+        //2.获取组织所在网格
+        List<String> agencyIdList = customerAgencyList.stream().map(a->a.getId()).collect(Collectors.toList());
+//        agencyIdList.add(customerAgency.getId());
+        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getPid, agencyIdList));
+
+        if(CollectionUtils.isEmpty(customerGridList)){
+            return covertToTree(customerAgency,agencyList);
+        }
+
+        List<BuildingTreeLevelDTO> gridList = customerGridList.stream().map(item -> {
+            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+            buildingTreeLevelDTO.setId(item.getId());
+            buildingTreeLevelDTO.setLabel(item.getGridName());
+            buildingTreeLevelDTO.setLevel("grid");
+            buildingTreeLevelDTO.setPId(item.getPid());
+            buildingTreeLevelDTO.setChildren(new ArrayList<>());
+            return buildingTreeLevelDTO;
+        }).collect(Collectors.toList());
+
+
+        //3.获取网格下的所有小区
+        List<String> gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList());
+        List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList));
+        if(CollectionUtils.isEmpty(customerGridList)){
+            agencyList.addAll(gridList);
+            return covertToTree(customerAgency,agencyList);
+        }
+        List<BuildingTreeLevelDTO> neighbourHoodList = icNeighborHoodList.stream().map(item -> {
+            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+            buildingTreeLevelDTO.setId(item.getId());
+            buildingTreeLevelDTO.setPId(item.getGridId());
+            buildingTreeLevelDTO.setLabel(item.getNeighborHoodName());
+            buildingTreeLevelDTO.setLevel("neighbourHood");
+            buildingTreeLevelDTO.setChildren(new ArrayList<>());
+            return buildingTreeLevelDTO;
+        }).collect(Collectors.toList());
+
+        //3.获取小区下的所有楼宇
+        List<String> neighborHoodIdList = icNeighborHoodList.stream().map(a->a.getId()).collect(Collectors.toList());
+        List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(new QueryWrapper<IcBuildingEntity>().lambda().in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList));
+
+        if(CollectionUtils.isEmpty(neighborHoodIdList)){
+            agencyList.addAll(gridList);
+            agencyList.addAll(neighbourHoodList);
+            return covertToTree(customerAgency,agencyList);
+        }
+        //组合封装
+
+        List<BuildingTreeLevelDTO> buildingList = icBuildingList.stream().map(item -> {
+            BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+            buildingTreeLevelDTO.setId(item.getId());
+            buildingTreeLevelDTO.setPId(item.getNeighborHoodId());
+            buildingTreeLevelDTO.setLabel(item.getBuildingName());
+            buildingTreeLevelDTO.setLevel("building");
+            buildingTreeLevelDTO.setChildren(new ArrayList<>());
+            return buildingTreeLevelDTO;
+        }).collect(Collectors.toList());
+
+
+
+
+        //组织
+//        gridList.stream()
+//        Map<String, List<BuildingTreeLevelDTO>> gridMap = gridList.stream().collect(Collectors.groupingBy(e -> e.getPId()));
+//        List<BuildingTreeLevelDTO> allList = agencyList.addAll(gridList)
+
+        agencyList.addAll(gridList);
+        agencyList.addAll(neighbourHoodList);
+        agencyList.addAll(buildingList);
+        return covertToTree(customerAgency,agencyList);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void importExcel(String customerId, List<IcBuildingExcel> list) {
+        //导入
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        //查询所有组织和网格根据名字
+
+
+
+        //获取所有小区 list 根据组织和网格
+        Set<String> neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toSet());
+        Set<String> agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toSet());
+        Set<String> gridNameList = list.stream().map(item -> item.getGridName()).collect(Collectors.toSet());
+        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectListByName(new ArrayList<String>(neighborNameList),new ArrayList<String>(agencyNameList),new ArrayList<String>(gridNameList));
+//        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getNeighborHoodName, neighborNameList));
+        Map<String,IcNeighborHoodEntity> neighborHoodMap =  neighborHoodList.stream().collect(Collectors.toMap(IcNeighborHoodEntity::getNeighborHoodName, Function.identity(),(key1, key2)->key1));
+
+
+        //2.获取小区数据
+        //封装数据
+        List<IcBuildingEntity> buildingEntityList = new ArrayList<>();
+        List<IcBuildingUnitEntity> icBuildingUnitEntityList = new ArrayList<>();
+        for (IcBuildingExcel icBuildingExcel : list) {
+            IcBuildingEntity entity = new IcBuildingEntity();
+            String uuid  = UUID.randomUUID().toString().replace("-", "");
+            entity.setId(uuid);
+            entity.setCustomerId(customerId);
+            entity.setNeighborHoodId(neighborHoodMap.get(icBuildingExcel.getNeighborHoodName()).getId());
+            entity.setBuildingName(icBuildingExcel.getBuildingName());
+            entity.setTotalUnitNum(icBuildingExcel.getTotalUnitNum());
+            entity.setTotalFloorNum(icBuildingExcel.getTotalFloorNum());
+            entity.setTotalHouseNum(icBuildingExcel.getTotalHouseNum());
+            buildingEntityList.add(entity);
+
+            Integer totalUnitNum =  icBuildingExcel.getTotalUnitNum();
+            //设置楼宇单元
+            List<IcBuildingUnitEntity> unitList = new ArrayList<>();
+            for(int i =0 ;i<totalUnitNum;i++){
+                IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
+                icBuildingUnit.setBuildingId(uuid);
+                icBuildingUnit.setUnitName(String.valueOf(i+1));
+                icBuildingUnit.setUnitNum(String.valueOf(i+1));
+                unitList.add(icBuildingUnit);
+            }
+            icBuildingUnitEntityList.addAll(unitList);
+        }
+        //3.保存
+        //4.新增单元
+        icBuildingService.insertBatch(buildingEntityList);
+        icBuildingUnitService.insertBatch(icBuildingUnitEntityList);
+
+    }
+
+
+    private List<BuildingTreeLevelDTO> covertToTree(CustomerAgencyEntity customerAgency,List<BuildingTreeLevelDTO> agencyList) {
+        BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+        buildingTreeLevelDTO.setId(customerAgency.getId());
+        buildingTreeLevelDTO.setLabel(customerAgency.getOrganizationName());
+        buildingTreeLevelDTO.setLevel(customerAgency.getLevel());
+        buildingTreeLevelDTO.setChildren(new ArrayList<>());
+        recursionCovertToTree(buildingTreeLevelDTO,agencyList);
+        List<BuildingTreeLevelDTO> result = new ArrayList<>();
+        result.add(buildingTreeLevelDTO);
+        return result;
+    }
+
+    private void recursionCovertToTree(BuildingTreeLevelDTO parent, List<BuildingTreeLevelDTO> customerAgencyList) {
+        //获取子节点
+        List<BuildingTreeLevelDTO> subList = customerAgencyList.stream().filter(item -> item.getPId().equals(parent.getId())).collect(Collectors.toList());
+
+        for(BuildingTreeLevelDTO agencyEntity :subList){
+            recursionCovertToTree(agencyEntity,customerAgencyList);
+        }
+        parent.setChildren(subList);
+
+    }
+
+
+
+    /**
+     * 更新
+     * @param customerId
+     * @param formDTO
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) {
+        IcBuildingDTO icBuilding= icBuildingService.get(formDTO.getBuildingId());
+
+        if(!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())){
+            //更新对应房屋小区名
+            List<IcHouseEntity> icHouseEntities = icHouseDao.selectList(new QueryWrapper<IcHouseEntity>().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()));
+            icHouseEntities.forEach(item->{
+                item.setNeighborHoodId(formDTO.getNeighborHoodId());
+            });
+            icHouseService.updateBatchById(icHouseEntities);
+        }
+        IcBuildingDTO icBuildingDTO= ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
+        icBuildingDTO.setId(formDTO.getBuildingId());
+        icBuildingDTO.setCustomerId(customerId);
+        icBuildingService.update(icBuildingDTO);
+        //更新楼宇单元
+        //如果楼宇单元大于之前的楼宇单元，新增单元
+        //如果小于，判断是否存在房屋，如果存在就提示不能更改
+
+
+    }
+
+    /**
+     * 删除
+     * @param buildingId
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void DelBuilding(String buildingId) {
+        //删除小区
+        icBuildingService.deleteById(buildingId);
+    }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
new file mode 100644
index 0000000000..724a35b032
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -0,0 +1,152 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcBuildingDao;
+import com.epmet.dao.IcBuildingUnitDao;
+import com.epmet.dao.IcHouseDao;
+import com.epmet.dao.IcNeighborHoodDao;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.IcHouseFormDTO;
+import com.epmet.entity.IcHouseEntity;
+import com.epmet.excel.IcHouseExcel;
+import com.epmet.service.HouseService;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcBuildingUnitService;
+import com.epmet.service.IcHouseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class HouseServiceImpl implements HouseService {
+
+
+
+    @Autowired
+    private IcHouseService icHouseService;
+    @Autowired
+    private IcBuildingService icBuildingService;
+    @Autowired
+    private IcBuildingUnitService icBuildingUnitService;
+    @Resource
+    private IcNeighborHoodDao icNeighborHoodDao;
+    @Resource
+    private IcBuildingDao icBuildingDao;
+    @Resource
+    private IcBuildingUnitDao icBuildingUnitDao;
+    @Resource
+    private IcHouseDao icHouseDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addHouse(String customerId, IcHouseFormDTO formDTO) {
+        IcHouseDTO icHouseDTO= ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
+        icHouseDTO.setCustomerId(customerId);
+        icHouseDTO.setRentFlag(formDTO.getRentFlag()?1:0);
+
+        icHouseDTO.setHouseName(getHouseName(formDTO));
+        icHouseService.save(icHouseDTO);
+    }
+
+    private String getHouseName(IcHouseFormDTO formDTO){
+        //设置房间名 楼栋-单元号-门牌号
+        IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingUnitId());
+        IcBuildingUnitDTO icBuildingUnit = icBuildingUnitService.get(formDTO.getBuildingUnitId());
+        String doorName = formDTO.getDoorName();
+        String buildingName = Optional.ofNullable(icBuilding).map(u->u.getBuildingName()).orElse("");
+        String unitName = Optional.ofNullable(icBuildingUnit).map(u->u.getUnitNum()).orElse("");
+        return  new StringBuilder().append(buildingName).append("-").append(unitName).append("-").append(doorName).toString();
+    }
+
+    /**
+     * 更新
+     * @param customerId
+     * @param formDTO
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateHouse(String customerId, IcHouseFormDTO formDTO) {
+        IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
+        icHouseDTO.setId(formDTO.getHouseId());
+        icHouseDTO.setCustomerId(customerId);
+        icHouseDTO.setRentFlag(formDTO.getRentFlag()?1:0);
+        //设置
+        icHouseDTO.setHouseName(getHouseName(formDTO));
+        icHouseService.update(icHouseDTO);
+    }
+
+    /**
+     * 删除
+     * @param houseId
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delHouse(String houseId) {
+        //删除小区
+        icHouseService.deleteById(houseId);
+    }
+
+    @Override
+    public void importExcel(String customerId, List<IcHouseExcel> list) {
+        //导入
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        //获取所有小区 list
+//        List<String> neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toList());
+//        List<IcNeighborHoodEntity> neighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getNeighborHoodName, neighborNameList));
+//        Map<String,IcNeighborHoodEntity> neighborHoodMap =  neighborHoodList.stream().collect(Collectors.toMap(IcNeighborHoodEntity::getNeighborHoodName, Function.identity(),(key1, key2)->key1));
+
+        //获取所有楼宇 list
+//        List<String> buildingNameList = list.stream().map(item -> item.getBuildingName()).collect(Collectors.toList());
+
+//        icBuildingDao.selectList(new QueryWrapper<IcBuildingEntity>().lambda().in(IcBuildingEntity::getBuildingName, buildingNameList).in();
+        Set<String> neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toSet());
+        Set<String> buildingNameList = list.stream().map(item -> item.getBuildingName()).collect(Collectors.toSet());
+        Set<Integer> buildingUnitList = list.stream().map(item -> item.getBuildingUnit()).collect(Collectors.toSet());
+        List<Map<String,Object>> buildMapList =  icBuildingDao.selectListByName(new ArrayList<String>(neighborNameList),new ArrayList<String>(buildingNameList),new ArrayList<Integer>(buildingUnitList));
+        //转Map
+        Map<String,Map<String,Object>> buildMap = new HashMap<>();
+        buildMapList.forEach(item->{
+            buildMap.put(item.get("neighborName")+","+item.get("buildingName")+","+item.get("unitNum"),item);
+        });
+        //封装数据
+        List<IcHouseEntity> houseEntityList = new ArrayList<>();
+        for (IcHouseExcel icHouseExcel : list) {
+            IcHouseEntity entity = new IcHouseEntity();
+            String uuid  = UUID.randomUUID().toString().replace("-", "");
+            entity.setId(uuid);
+            entity.setCustomerId(customerId);
+            Map<String,Object> item = buildMap.get(icHouseExcel.getNeighborHoodName()+","+icHouseExcel.getBuildingName()+","+icHouseExcel.getBuildingUnit());
+            if(!CollectionUtils.isEmpty(item)){
+                entity.setNeighborHoodId(String.valueOf(item.get("neighborId")));
+                entity.setBuildingId(String.valueOf(item.get("buildingId")));
+                entity.setBuildingUnitId(String.valueOf(item.get("buildingUnitId")));
+                entity.setHouseName(icHouseExcel.getBuildingName()+"-"+icHouseExcel.getBuildingUnit()+"-"+icHouseExcel.getDoorName());
+            }
+            entity.setDoorName(icHouseExcel.getDoorName());
+            entity.setHouseType(icHouseExcel.getHouseType());
+            entity.setPurpose(icHouseExcel.getPurpose());
+            entity.setRentFlag("是".equals(icHouseExcel.getRentFlag())?1:0);
+            entity.setOwnerName(icHouseExcel.getOwnerName());
+            entity.setOwnerPhone(icHouseExcel.getOwnerPhone());
+            entity.setOwnerIdCard(icHouseExcel.getOwnerIdCard());
+            houseEntityList.add(entity);
+        }
+        //3.保存
+        //4.新增单元
+        icHouseService.insertBatch(houseEntityList);
+
+    }
+
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index b6c2a4347c..fff8156f11 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -1,37 +1,43 @@
 package com.epmet.service.impl;
 
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
-import com.epmet.dao.IcNeighborHoodDao;
-import com.epmet.dao.IcNeighborHoodPropertyDao;
+import com.epmet.dao.*;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
 import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
-import com.epmet.entity.IcNeighborHoodEntity;
-import com.epmet.entity.IcNeighborHoodPropertyEntity;
+import com.epmet.entity.*;
+import com.epmet.excel.IcBuildingExcel;
+import com.epmet.excel.IcHouseExcel;
+import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcNeighborHoodPropertyService;
 import com.epmet.service.IcNeighborHoodService;
 import com.epmet.service.NeighborHoodService;
+import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -52,6 +58,16 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
 
     @Resource
     private IcNeighborHoodDao icNeighborHoodDao;
+    @Resource
+    private IcBuildingDao icBuildingDao;
+    @Resource
+    private IcHouseDao icHouseDao;
+    @Resource
+    private CustomerAgencyDao customerAgencyDao;
+    @Resource
+    private CustomerGridDao customerGridDao;
+    @Resource
+    private IcPropertyManagementDao icPropertyManagementDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -66,14 +82,15 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
         CustomerAgencyDTO customerAgencyDTO =  Optional.ofNullable(customerAgencyResult.getData()).orElse(new CustomerAgencyDTO());
         icNeighborHoodDTO.setParentAgencyId(customerAgencyDTO.getPid());
         icNeighborHoodDTO.setAgencyPids(customerAgencyDTO.getPids());
-        icNeighborHoodService.save(icNeighborHoodDTO);
-
+        IcNeighborHoodEntity entity = ConvertUtils.sourceToTarget(icNeighborHoodDTO, IcNeighborHoodEntity.class);
+//        icNeighborHoodService.save(icNeighborHoodDTO);
+        icNeighborHoodDao.insert(entity);
         //设置物业关联
         String propertyId = formDTO.getPropertyId();
         if(!StringUtils.isEmpty(propertyId)){
             //保存物业关系表
             IcNeighborHoodPropertyDTO icNeighborHoodPropertyDTO = new IcNeighborHoodPropertyDTO();
-            icNeighborHoodPropertyDTO.setNeighborHoodId(icNeighborHoodDTO.getId());
+            icNeighborHoodPropertyDTO.setNeighborHoodId(entity.getId());
             icNeighborHoodPropertyDTO.setPropertyId(propertyId);
             icNeighborHoodPropertyService.save(icNeighborHoodPropertyDTO);
         }
@@ -85,7 +102,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
      */
     @Override
     public IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO) {
-        String dataType = formDTO.getDataType();
+        String dataType = formDTO.getLevel();
         Integer pageNo = formDTO.getPageNo();
         Integer pageSize = formDTO.getPageSize();
 
@@ -101,14 +118,93 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
             result.setList(resultMap.getRecords());
         }else if(NeighborhoodConstant.BUILDING.equals(dataType)){
             //如果类型是building 查楼栋
-            IPage<Map<String, Object>> resultMap = searchNeighborhood(formDTO);
+            IPage<Map<String, Object>> resultMap = searchBuilding(formDTO);
+            result.setTotal(resultMap.getTotal());
+            result.setList(resultMap.getRecords());
         }else if(NeighborhoodConstant.HOUSE.equals(dataType)){
             //如果类型是house 查房屋
-            IPage<Map<String, Object>> resultMap = searchNeighborhood(formDTO);
+            IPage<Map<String, Object>> resultMap = searchHouse(formDTO);
+            result.setTotal(resultMap.getTotal());
+            result.setList(resultMap.getRecords());
         }
         return result;
 
     }
+
+
+
+    private IPage<Map<String, Object>> searchHouse(ListIcNeighborHoodFormDTO formDTO) {
+        IPage<IcHouseEntity> page = new Page<IcHouseEntity>(formDTO.getPageNo(),formDTO.getPageSize());
+
+//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
+//        neighborHoodEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
+//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
+//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
+//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+//        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+
+
+//        QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
+//        buildingEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
+//                .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
+//        IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
+
+
+//        QueryWrapper<IcHouseEntity> houseEntityQueryWrapper = new QueryWrapper<>();
+//        houseEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getOwnerName()),IcHouseEntity::getOwnerName,formDTO.getOwnerName())
+//                .like(!StringUtils.isEmpty(formDTO.getOwnerPhone()),IcHouseEntity::getOwnerPhone,formDTO.getOwnerPhone());
+//        houseEntityQueryWrapper.eq("a.DEL_FLAG","0");
+        IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
+        house.setDelFlag("0");
+
+        return  icHouseDao.searchHouseByPage(page,house);
+    }
+    private IPage<Map<String, Object>> searchBuilding(ListIcNeighborHoodFormDTO formDTO) {
+        IPage<IcBuildingEntity> page = new Page<IcBuildingEntity>(formDTO.getPageNo(),formDTO.getPageSize());
+
+//        IcNeighborHoodEntity neighbor = new IcNeighborHoodEntity();
+//        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+
+//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
+//        neighborHoodEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
+//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
+//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
+//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+
+
+        IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
+        building.setDelFlag("0");
+//        QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
+//
+//        buildingEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
+//                .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
+//        buildingEntityQueryWrapper.eq("a.DEL_FLAG","0");
+
+        return  icBuildingDao.searchBuildingByPage(page,building);
+    }
+
+    private IPage<Map<String,Object>> searchNeighborhood(ListIcNeighborHoodFormDTO formDTO) {
+
+        IPage<IcNeighborHoodEntity> page = new Page<IcNeighborHoodEntity>(formDTO.getPageNo(),formDTO.getPageSize());
+
+//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
+//        neighborHoodEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
+//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
+//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
+//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+//        neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0");
+
+        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+        neighbor.setDelFlag("0");
+        return  icNeighborHoodDao.searchNeighborhoodByPage(page, neighbor);
+    }
+
     /**
      * 更新
      * @param customerId
@@ -171,16 +267,148 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
 
     }
 
-    private IPage<Map<String,Object>> searchNeighborhood(ListIcNeighborHoodFormDTO formDTO) {
+    /**
+     * 导出数据
+     * @param formDTO
+     * @param response
+     */
+    @Override
+    public void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception  {
+        String dataType = formDTO.getLevel();
 
-        IPage<IcNeighborHoodEntity> page = new Page<IcNeighborHoodEntity>(formDTO.getPageNo(),formDTO.getPageSize());
+        if(StringUtils.isEmpty(dataType)|| NeighborhoodConstant.NEIGHBOR_HOOD.equals(dataType)){
+            //如果类型是neighbourHood 查小区
+            //导出小区
+            List<IcNeighborHoodExcel> icNeighborHoodExcels = searchAllNeighborhood(formDTO);
+//            ExcelUtils.exportExcelToTarget(response, "小区信息录入表", icNeighborHoodExcels, IcNeighborHoodExcel.class);
+
+            TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_template.xlsx");
+            ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"小区信息录入表",response);
+
+            return ;
+        }else if(NeighborhoodConstant.BUILDING.equals(dataType)){
+            //如果类型是building 查楼栋
+            //导出楼栋
+            List<IcBuildingExcel> icBuildingExcels = searchAllBuilding(formDTO);
+//            ExcelUtils.exportExcelToTarget(response, "楼宇信息录入表", icBuildingExcels, IcBuildingExcel.class);
+            TemplateExportParams templatePath = new TemplateExportParams("excel/building_template.xlsx");
+            ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"楼宇信息录入表",response);
+
+            return ;
+        }else if(NeighborhoodConstant.HOUSE.equals(dataType)){
+            //如果类型是house 查房屋
+            //导出房屋
+
+            List<IcHouseExcel> icHouseExcels = searchAllHouse(formDTO);
+//            ExcelUtils.exportExcelToTarget(response, "房屋信息录入表", icHouseExcels, IcHouseExcel.class);
+            TemplateExportParams templatePath = new TemplateExportParams("excel/house_template.xlsx");
+            ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"房屋信息录入表",response);
+
+            return ;
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void importExcel(String customerId,List<IcNeighborHoodExcel> list) {
+        //导入
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        //获取所有组织 list
+        List<String> agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toList());
+        //获取所有网格 list
+        List<String> gridNameList = list.stream().map(item->item.getGridName()).collect(Collectors.toList());
+        //获取所有物业 list
+        List<String> propertyNameList = list.stream().map(item->item.getPropertyName()).collect(Collectors.toList());
+        //查询对应的id
+        List<CustomerAgencyEntity> customerAgencyList = customerAgencyDao.selectList(new QueryWrapper<CustomerAgencyEntity>().lambda().in(CustomerAgencyEntity::getOrganizationName, agencyNameList));
+        List<CustomerGridEntity> customerGridList = customerGridDao.selectList(new QueryWrapper<CustomerGridEntity>().lambda().in(CustomerGridEntity::getGridName, gridNameList));
+        List<IcPropertyManagementEntity> icPropertyManagementList = icPropertyManagementDao.selectList(new QueryWrapper<IcPropertyManagementEntity>().lambda().in(IcPropertyManagementEntity::getName, propertyNameList));
+
+        Map<String,CustomerAgencyEntity> agencyMap =  customerAgencyList.stream().collect(Collectors.toMap(CustomerAgencyEntity::getOrganizationName, Function.identity(),(key1, key2)->key1));
+        Map<String,CustomerGridEntity> gridMap = customerGridList.stream().collect(Collectors.toMap(CustomerGridEntity::getGridName,Function.identity(),(key1,key2)->key1));
+        Map<String,IcPropertyManagementEntity> propertyMap =  icPropertyManagementList.stream().collect(Collectors.toMap(IcPropertyManagementEntity::getName,Function.identity(),(key1,key2)->key1));
+
+        //封装数据
+        List<IcNeighborHoodEntity> neighborHoodEntityList = new ArrayList<>();
+        List<IcNeighborHoodPropertyEntity> icNeighborHoodPropertyEntityList = new ArrayList<>();
+        for (IcNeighborHoodExcel  icNeighborHoodExcel : list) {
+            IcNeighborHoodEntity entity = new IcNeighborHoodEntity();
+            String uuid  =UUID.randomUUID().toString().replace("-", "");
+            entity.setId(uuid);
+            entity.setCustomerId(customerId);
+            entity.setNeighborHoodName(icNeighborHoodExcel.getNeighborHoodName());
+            entity.setAgencyId(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId());
+            entity.setParentAgencyId(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid());
+            entity.setAgencyPids(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids());
+            entity.setGridId(gridMap.get(icNeighborHoodExcel.getGridName()).getId());
+            entity.setAddress(icNeighborHoodExcel.getAddress());
+            entity.setRemark(icNeighborHoodExcel.getRemark());
+            neighborHoodEntityList.add(entity);
 
-        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
-        neighborHoodEntityQueryWrapper.lambda()
-                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
-                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+            IcNeighborHoodPropertyEntity entity1 = new IcNeighborHoodPropertyEntity();
+            entity1.setPropertyId(propertyMap.get(icNeighborHoodExcel.getPropertyName()).getId());
+            entity1.setNeighborHoodId(uuid);
+            icNeighborHoodPropertyEntityList.add(entity1);
+        }
+
+//        icNeighborHoodDao.
+        //保存
+        icNeighborHoodService.insertBatch(neighborHoodEntityList);
+        icNeighborHoodPropertyService.insertBatch(icNeighborHoodPropertyEntityList);
+
+    }
+
+    private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {
+
+//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
+//        neighborHoodEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
+//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
+//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
+//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+//        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+
+//        QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
+//        buildingEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
+//                .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
+//        buildingEntityQueryWrapper.eq("a.DEL_FLAG","0");
+        IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
+        building.setDelFlag("0");
+
+        return  icBuildingDao.searchAllBuilding(building);
+    }
+
+    private List<IcNeighborHoodExcel> searchAllNeighborhood(ListIcNeighborHoodFormDTO formDTO) {
+//        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
+//        neighborHoodEntityQueryWrapper.lambda()
+//                .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
+//                .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
+//                .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
+//                .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
+//        neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0");
+        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+        neighbor.setDelFlag("0");
+
+        return  icNeighborHoodDao.searchAllNeighborhood(neighbor);
+    }
+
+    private List<IcHouseExcel> searchAllHouse(ListIcNeighborHoodFormDTO formDTO) {
+
+        IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
+
+        IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
 
 
-        return  icNeighborHoodDao.searchNeighborhoodByPage(page, neighborHoodEntityQueryWrapper);
+        IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
+        house.setDelFlag("0");
+
+        return  icHouseDao.searchAllHouse(neighbor,building,house);
     }
+
+
+
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ExcelPoiUtils.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ExcelPoiUtils.java
new file mode 100644
index 0000000000..fa03b631d1
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ExcelPoiUtils.java
@@ -0,0 +1,276 @@
+package com.epmet.util;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+public class ExcelPoiUtils {
+    /**
+     * excel 导出
+     *
+     * @param list     数据列表
+     * @param fileName 导出时的excel名称
+     * @param response
+     */
+    public static void exportExcel(List<Map<String, Object>> list, String fileName, HttpServletResponse response) throws IOException {
+        defaultExport(list, fileName, response);
+    }
+
+    /**
+     * 默认的 excel 导出
+     *
+     * @param list     数据列表
+     * @param fileName 导出时的excel名称
+     * @param response
+     */
+    private static void defaultExport(List<Map<String, Object>> list, String fileName, HttpServletResponse response) throws IOException {
+        //把数据添加到excel表格中
+        Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list         数据列表
+     * @param pojoClass    pojo类型
+     * @param fileName     导出时的excel名称
+     * @param response
+     * @param exportParams 导出参数（标题、sheet名称、是否创建表头，表格类型）
+     */
+    private static void defaultExport(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response, ExportParams exportParams) throws IOException {
+        //把数据添加到excel表格中
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list         数据列表
+     * @param pojoClass    pojo类型
+     * @param fileName     导出时的excel名称
+     * @param exportParams 导出参数（标题、sheet名称、是否创建表头，表格类型）
+     * @param response
+     */
+    public static void exportExcel(List<?> list, Class<?> pojoClass, String fileName, ExportParams exportParams, HttpServletResponse response) throws IOException {
+        defaultExport(list, pojoClass, fileName, response, exportParams);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list      数据列表
+     * @param title     表格内数据标题
+     * @param sheetName sheet名称
+     * @param pojoClass pojo类型
+     * @param fileName  导出时的excel名称
+     * @param response
+     */
+    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName, HttpServletResponse response) throws IOException {
+        defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF));
+    }
+
+
+
+    /**
+     * excel 导出
+     *
+     * @param list           数据列表
+     * @param title          表格内数据标题
+     * @param sheetName      sheet名称
+     * @param pojoClass      pojo类型
+     * @param fileName       导出时的excel名称
+     * @param isCreateHeader 是否创建表头
+     * @param response
+     */
+    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName, boolean isCreateHeader, HttpServletResponse response) throws IOException {
+        ExportParams exportParams = new ExportParams(title, sheetName, ExcelType.XSSF);
+        exportParams.setCreateHeadRows(isCreateHeader);
+        defaultExport(list, pojoClass, fileName, response, exportParams);
+    }
+    /**
+     * 根据模板生成excel后导出
+     * @param templatePath  模板路径
+     * @param map 数据集合
+     * @param fileName 文件名
+     * @param response
+     * @throws IOException
+     */
+    public static void exportExcel(TemplateExportParams templatePath, Map<String, Object> map, String fileName, HttpServletResponse response) throws IOException {
+        Workbook workbook = ExcelExportUtil.exportExcel(templatePath, map);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+
+    /**
+     * excel下载
+     *
+     * @param fileName 下载时的文件名称
+     * @param response
+     * @param workbook excel数据
+     */
+    private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
+        try {
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-Type", "application/vnd.ms-excel");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xlsx", "UTF-8"));
+            workbook.write(response.getOutputStream());
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+
+
+    /**
+     * excel 导入
+     *
+     * @param file      excel文件
+     * @param pojoClass pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Class<T> pojoClass) throws IOException {
+        return importExcel(file, 1, 1, pojoClass);
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param filePath   excel文件路径
+     * @param titleRows  表格内数据标题行
+     * @param headerRows 表头行
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (StringUtils.isBlank(filePath)) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);
+        params.setHeadRows(headerRows);
+        params.setNeedSave(true);
+        params.setSaveUrl("/excel/");
+        try {
+            return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("模板不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+
+    /**
+     * excel 导入
+     *
+     * @param file       上传的文件
+     * @param titleRows  表格内数据标题行
+     * @param headerRows 表头行
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (file == null) {
+            return null;
+        }
+        try {
+            return importExcel(file.getInputStream(), titleRows, headerRows, pojoClass);
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param inputStream 文件输入流
+     * @param titleRows   表格内数据标题行
+     * @param headerRows  表头行
+     * @param pojoClass   pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (inputStream == null) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);
+        params.setHeadRows(headerRows);
+        params.setSaveUrl("/excel/");
+        params.setNeedSave(true);
+        try {
+            return ExcelImportUtil.importExcel(inputStream, pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("excel文件不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+    /**
+     * excel 导入，有错误信息
+     *
+     * @param file      上传的文件
+     * @param pojoClass pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> ExcelImportResult<T> importExcelMore(MultipartFile file, Class<T> pojoClass) throws IOException {
+        if (file == null) {
+            return null;
+        }
+        try {
+            return importExcelMore(file.getInputStream(), pojoClass);
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param inputStream 文件输入流
+     * @param pojoClass   pojo类型
+     * @param <T>
+     * @return
+     */
+    private static <T> ExcelImportResult<T> importExcelMore(InputStream inputStream, Class<T> pojoClass) throws IOException {
+        if (inputStream == null) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(1);//表格内数据标题行
+        params.setHeadRows(1);//表头行
+        params.setSaveUrl("/excel/");
+        params.setNeedSave(true);
+        params.setNeedVerify(true);
+        try {
+            return ExcelImportUtil.importExcelMore(inputStream, pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("excel文件不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index dc1c51b285..dc2f9674ba 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -108,6 +108,8 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
 
 feign:
   hystrix:
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..1334d9dcd9725eb8aa7068115831d8d29f884b95
GIT binary patch
literal 11756
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
D9sswP

literal 0
HcmV?d00001

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a095e3e0f5fcc4b93eaf764066d069a9bb5c9889
GIT binary patch
literal 11445
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
Q&j1~u2xYq}!_U9|ACWGEG5`Po

literal 0
HcmV?d00001

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..36297ea510f4e9d917b11d0da6106ac096d05a27
GIT binary patch
literal 11674
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

literal 0
HcmV?d00001

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 8d9249b655..0cb73c45a8 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
@@ -25,5 +25,233 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--<select id="searchBuildingByPage" resultType="map">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+        a.BUILDING_NAME as buildingType,
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+        and b.ID in (
+            select c.id from ic_neighbor_hood c
+            INNER JOIN customer_agency d  on c.AGENCY_ID = d.ID
+            INNER JOIN customer_grid e  on c.GRID_ID = e.ID
+            ${ew.customSqlSegment}
+        )
+            ${ew1}
+    </select>-->
+
+
+    <select id="searchBuildingByPage" resultType="map">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+        a.BUILDING_NAME as buildingType,
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+        <where>
+
+            <if test="building.id != null and building.id.trim() != ''">
+                AND a.NEIGHBOR_HOOD_ID = #{building.id}
+            </if>
+            <if test="building.buildingName != null and building.buildingName.trim() != ''">
+                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+            </if>
+            <if test="building.delFlag != null and building.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+
+    </select>
+    <!--<select id="searchBuildingByPage" resultType="map">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+        a.BUILDING_NAME as buildingType,
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+
+        <if test="neighbor.id != null and neighbor.id.trim() != ''">
+            AND b.ID = #{neighbor.id}
+        </if>
+        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+            AND b.AGENCY_ID = #{neighbor.agencyId}
+        </if>
+        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+            AND b.GRID_ID = #{neighbor.gridId}
+        </if>
+        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+            AND b.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+        </if>
+
+        <where>
+
+            <if test="building.id != null and building.id.trim() != ''">
+                AND a.ID = #{building.id}
+            </if>
+            <if test="building.buildingName != null and building.buildingName.trim() != ''">
+                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+            </if>
+            <if test="building.delFlag != null and building.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+
+    </select>-->
+
+
+    <!--<select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
+        select
+
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        f.ORGANIZATION_NAME as agencyName,
+        g.GRID_NAME as gridName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+        and b.ID in (
+            select c.id from ic_neighbor_hood c
+            INNER JOIN customer_agency d  on c.AGENCY_ID = d.ID
+            INNER JOIN customer_grid e  on c.GRID_ID = e.ID
+            ${ew.customSqlSegment}
+        )
+        LEFT JOIN customer_agency f on b.AGENCY_ID = f.ID
+        LEFT JOIN customer_grid g on b.GRID_ID = g.ID
+        ${ew1.customSqlSegment}
+    </select>-->
+    <!--<select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+        a.BUILDING_NAME as buildingType,
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        c.ORGANIZATION_NAME as agencyName,
+        d.GRID_NAME as gridName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+        LEFT JOIN customer_agency c on b.AGENCY_ID = c.ID
+        LEFT JOIN customer_grid c on b.GRID_ID = d.ID
+
+        <if test="neighbor.id != null and neighbor.id.trim() != ''">
+            AND b.ID = #{neighbor.id}
+        </if>
+        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+            AND b.AGENCY_ID = #{neighbor.agencyId}
+        </if>
+        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+            AND b.GRID_ID = #{neighbor.gridId}
+        </if>
+        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+            AND b.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+        </if>
+
+        <where>
+
+            <if test="building.id != null and building.id.trim() != ''">
+                AND a.ID = #{building.id}
+            </if>
+            <if test="building.buildingName != null and building.buildingName.trim() != ''">
+                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+            </if>
+            <if test="building.delFlag != null and building.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+    </select>-->
+    <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        a.TOTAL_HOUSE_NUM as totalHouseNum,
+        a.TOTAL_FLOOR_NUM as totalFloorNum,
+        a.TOTAL_UNIT_NUM as totalUnitNum,
+        a.BUILDING_NAME as buildingType,
+        b.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        c.ORGANIZATION_NAME as agencyName,
+        d.GRID_NAME as gridName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID
+        LEFT JOIN customer_agency c on b.AGENCY_ID = c.ID
+        LEFT JOIN customer_grid c on b.GRID_ID = d.ID
+
+        <where>
+
+            <if test="building.id != null and building.id.trim() != ''">
+                AND a.NEIGHBOR_HOOD_ID = #{building.id}
+            </if>
+            <if test="building.buildingName != null and building.buildingName.trim() != ''">
+                AND a.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+            </if>
+            <if test="building.delFlag != null and building.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">
+
+        SELECT
+            ca.id AS Id,
+            ca.organization_name AS organizationName,
+            ca.LEVEL AS LEVEL,
+            ca.pid as pid,
+            ca.pids as pids
+        FROM
+            customer_agency ca
+        WHERE
+            ca.del_flag = '0'
+            and
+            CONCAT(':',ca.pids, ':') like  CONCAT('%:',#{agencyId},':%')
+    </select>
+
+    <select id="selectListByName" resultType="map">
+        select
+        a.id as neighborId,
+        b.id as buildingId,
+        c.id as buildingUnitId,
+        a.NEIGHBOR_HOOD_NAME as neighborName,
+        b.BUILDING_NAME as buildingName,
+        c.UNIT_NUM as unitNum
+
+        from ic_neighbor_hood a
+        INNER JOIN ic_building b on a.ID = b.NEIGHBOR_HOOD_ID and b.DEL_FLAG = '0' and b.BUILDING_NAME in
+        <foreach collection="buildingNameList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
+        INNER JOIN ic_building_unit c on b.ID = c.BUILDING_ID and c.DEL_FLAG = '0' and c.UNIT_NUM in
+        <foreach collection="buildingUnitList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
+        WHERE a.DEL_FLAG = '0' and a.NEIGHBOR_HOOD_NAME in
+        <foreach collection="neighborNameList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 25df6ce4a6..e62cb42010 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -26,5 +26,201 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--<select id="searchHouseByPage" resultType="map">
+            select
+            a.ID as houseId,
+            a.HOUSE_NAME as houseName,
+            a.DOOR_NAME as doorName,
+            a.HOUSE_TYPE as houseType,
+            a.PURPOSE as purpose,
+            a.RENT_FLAG as rentFlag,
+            a.OWNER_NAME as ownerName,
+            a.OWNER_PHONE as ownerPhone,
+            a.OWNER_ID_CARD as ownerIdCard,
+            b.BUILDING_NAME as buildingName,
+            c.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+            d.UNIT_NUM as unitName
+            from ic_house a
+            INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+            and c.ID in (select e.ID from ic_building e ${ew1.customSqlSegment})
+            INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+            and c.ID in (select f.ID from ic_neighbor_hood f
+              INNER JOIN customer_agency g  on f.AGENCY_ID = g.ID
+              INNER JOIN customer_grid h  on f.GRID_ID = h.ID
+                ${ew2.customSqlSegment}
+            )
+            LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+            ${ew.customSqlSegment}
+    </select>-->
+    <!--<select id="searchHouseByPage" resultType="map">
+        select
+        a.ID as houseId,
+        a.HOUSE_NAME as houseName,
+        a.DOOR_NAME as doorName,
+        a.HOUSE_TYPE as houseType,
+        a.PURPOSE as purpose,
+        a.RENT_FLAG as rentFlag,
+        a.OWNER_NAME as ownerName,
+        a.OWNER_PHONE as ownerPhone,
+        a.OWNER_ID_CARD as ownerIdCard,
+        b.BUILDING_NAME as buildingName,
+        c.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        d.UNIT_NUM as unitName
+        from ic_house a
+        INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+        <if test="building.id != null and building.id.trim() != ''">
+            AND b.ID = #{building.id}
+        </if>
+        <if test="building.buildingName != null and building.buildingName.trim() != ''">
+            AND b.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+        </if>
+
+        INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+        <if test="neighbor.id != null and neighbor.id.trim() != ''">
+            AND c.ID = #{neighbor.id}
+        </if>
+        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+            AND c.AGENCY_ID = #{neighbor.agencyId}
+        </if>
+        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+            AND c.GRID_ID = #{neighbor.gridId}
+        </if>
+        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+            AND c.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+        </if>
+        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+        <where>
+
+            <if test="house.ownerName != null and house.ownerName.trim() != ''">
+                AND a.OWNER_NAME = #{house.ownerName}
+            </if>
+            <if test="house.OWNER_PHONE != null and house.OWNER_PHONE.trim() != ''">
+                AND a.OWNER_PHONE = #{house.ownerPhone}
+            </if>
+            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+
+        </where>
+    </select>-->
+    <select id="searchHouseByPage" resultType="map">
+          select
+            a.ID as houseId,
+            a.HOUSE_NAME as houseName,
+            a.DOOR_NAME as doorName,
+            a.HOUSE_TYPE as houseType,
+            a.PURPOSE as purpose,
+            a.RENT_FLAG as rentFlag,
+            a.OWNER_NAME as ownerName,
+            a.OWNER_PHONE as ownerPhone,
+            a.OWNER_ID_CARD as ownerIdCard,
+            b.BUILDING_NAME as buildingName,
+            c.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+            d.UNIT_NUM as unitName
+            from ic_house a
+            INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+            INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+            LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+            <where>
+
+                <if test="house.id != null and house.id.trim() != ''">
+                    AND a.BUILDING_ID = #{house.id}
+                </if>
+                <if test="house.ownerName != null and house.ownerName.trim() != ''">
+                    AND a.OWNER_NAME = #{house.ownerName}
+                </if>
+                <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
+                    AND a.OWNER_PHONE = #{house.ownerPhone}
+                </if>
+                <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                    AND a.DEL_FLAG = #{house.delFlag}
+                </if>
+
+            </where>
+    </select>
+   <!-- <select id="searchAllHouse" resultType="com.epmet.excel.IcHouseExcel">
+        select
+        a.HOUSE_NAME as houseName,
+        a.DOOR_NAME as doorName,
+        a.HOUSE_TYPE as houseType,
+        a.PURPOSE as purpose,
+        a.RENT_FLAG as rentFlag,
+        a.OWNER_NAME as ownerName,
+        a.OWNER_PHONE as ownerPhone,
+        a.OWNER_ID_CARD as ownerIdCard,
+        b.BUILDING_NAME as buildingName,
+        c.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        d.UNIT_NUM as unitName
+        from ic_house a
+        INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+        <if test="building.id != null and building.id.trim() != ''">
+            AND b.ID = #{building.id}
+        </if>
+        <if test="building.buildingName != null and building.buildingName.trim() != ''">
+            AND b.BUILDING_NAME like  concat('%',trim(#{building.buildingName}),'%')
+        </if>
+
+        INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+        <if test="neighbor.id != null and neighbor.id.trim() != ''">
+            AND c.ID = #{neighbor.id}
+        </if>
+        <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+            AND c.AGENCY_ID = #{neighbor.agencyId}
+        </if>
+        <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+            AND c.GRID_ID = #{neighbor.gridId}
+        </if>
+        <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+            AND c.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+        </if>
+        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+        <where>
+
+            <if test="house.ownerName != null and house.ownerName.trim() != ''">
+                AND a.OWNER_NAME = #{house.ownerName}
+            </if>
+            <if test="house.OWNER_PHONE != null and house.OWNER_PHONE.trim() != ''">
+                AND a.OWNER_PHONE = #{house.ownerPhone}
+            </if>
+            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+
+        </where>
+    </select>-->
+    <select id="searchAllHouse" resultType="com.epmet.excel.IcHouseExcel">
+        select
+        a.HOUSE_NAME as houseName,
+        a.DOOR_NAME as doorName,
+        a.HOUSE_TYPE as houseType,
+        a.PURPOSE as purpose,
+        a.RENT_FLAG as rentFlag,
+        a.OWNER_NAME as ownerName,
+        a.OWNER_PHONE as ownerPhone,
+        a.OWNER_ID_CARD as ownerIdCard,
+        b.BUILDING_NAME as buildingName,
+        c.NEIGHBOR_HOOD_NAME as neighbourHoodName,
+        d.UNIT_NUM as unitName
+        from ic_house a
+        INNER JOIN ic_building b on a.BUILDING_ID = b.ID
+        INNER JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID
+        LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID
+        <where>
+            <if test="house.id != null and house.id.trim() != ''">
+                AND a.BUILDING_ID = #{house.id}
+            </if>
+            <if test="house.ownerName != null and house.ownerName.trim() != ''">
+                AND a.OWNER_NAME = #{house.ownerName}
+            </if>
+            <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
+                AND a.OWNER_PHONE = #{house.ownerPhone}
+            </if>
+            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{house.delFlag}
+            </if>
+
+        </where>
+    </select>
+
 
 </mapper>
\ No newline at end of file
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 8a057c3a9f..b1d6f0c7e3 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
@@ -25,7 +25,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="searchNeighborhoodByPage" resultType="map">
+    <!--<select id="searchNeighborhoodByPage" resultType="map">
         select
             a.id as neighborHoodId,
             a.NEIGHBOR_HOOD_NAME as neighborHoodName,
@@ -39,8 +39,121 @@
             left join customer_agency b  on a.AGENCY_ID = b.ID
 
             left join customer_grid c  on a.GRID_ID = c.ID
-            ${ew.customSqlSegment}
+        <where>
+            <if test="neighbor.id != null and neighbor.id.trim() != ''">
+                AND a.ID = #{neighbor.id}
+            </if>
+            <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+                AND a.AGENCY_ID = #{neighbor.agencyId}
+            </if>
+            <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+                AND a.GRID_ID = #{neighbor.gridId}
+            </if>
+            <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+                AND a.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+            </if>
+            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+    </select>-->
+    <select id="searchNeighborhoodByPage" resultType="map">
+        select
+        a.id as neighborHoodId,
+        a.NEIGHBOR_HOOD_NAME as neighborHoodName,
+        a.ADDRESS as address,
+        a.REMARK as remark,
+
+        b.ORGANIZATION_NAME as orgName,
+        c.GRID_NAME as gridName
+        from ic_neighbor_hood a
+
+        left join customer_agency b  on a.AGENCY_ID = b.ID
+
+        left join customer_grid c  on a.GRID_ID = c.ID
+        <where>
+            <if test="neighbor.id != null and neighbor.id.trim() != ''">
+                AND a.GRID_ID = #{neighbor.id}
+            </if>
+            <if test="neighbor.delFlag != null and neighbor.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{neighbor.delFlag}
+            </if>
+        </where>
+    </select>
+    <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
+        select
+        a.NEIGHBOR_HOOD_NAME as neighborHoodName,
+        a.ADDRESS as address,
+        a.REMARK as remark,
+        e.NAME as propertyName,
+        b.ORGANIZATION_NAME as agencyName,
+        c.GRID_NAME as gridName
+        from ic_neighbor_hood a
+
+        left join customer_agency b  on a.AGENCY_ID = b.ID
+
+        left join customer_grid c  on a.GRID_ID = c.ID
+        left join ic_neighbor_hood_property d  on a.ID = d.NEIGHBOR_HOOD_ID
+        left join ic_property_management e on d.PROPERTY_ID = e.ID
+        <where>
+            <if test="neighbor.id != null and neighbor.id.trim() != ''">
+                AND a.GRID_ID = #{neighbor.id}
+            </if>
+            <if test="neighbor.delFlag != null and neighbor.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+    </select>
+    <!--<select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
+        select
+            a.NEIGHBOR_HOOD_NAME as neighborHoodName,
+            a.ADDRESS as address,
+            a.REMARK as remark,
+            e.NAME as propertyName,
+            b.ORGANIZATION_NAME as agencyName,
+            c.GRID_NAME as gridName
+            from ic_neighbor_hood a
+
+            left join customer_agency b  on a.AGENCY_ID = b.ID
+
+            left join customer_grid c  on a.GRID_ID = c.ID
+            left join ic_neighbor_hood_property d  on a.ID = d.NEIGHBOR_HOOD_ID
+            left join ic_property_management e on d.PROPERTY_ID = e.ID
+        <where>
+            <if test="neighbor.id != null and neighbor.id.trim() != ''">
+                AND a.ID = #{neighbor.id}
+            </if>
+            <if test="neighbor.agencyId != null and neighbor.agencyId.trim() != ''">
+                AND a.AGENCY_ID = #{neighbor.agencyId}
+            </if>
+            <if test="neighbor.gridId != null and neighbor.gridId.trim() != ''">
+                AND a.GRID_ID = #{neighbor.gridId}
+            </if>
+            <if test="neighbor.neighborHoodName != null and neighbor.neighborHoodName.trim() != ''">
+                AND a.NEIGHBOR_HOOD_NAME like  concat('%',trim(#{neighbor.neighborHoodName}),'%')
+            </if>
+            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+                AND a.DEL_FLAG = #{building.delFlag}
+            </if>
+        </where>
+    </select>-->
+    <select id="selectListByName" resultMap="icNeighborHoodMap">
+        select a.* from
+        ic_neighbor_hood a
+        INNER JOIN customer_agency b on a.AGENCY_ID = b.ID and b.ORGANIZATION_NAME in
+        <foreach collection="agencyNameList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
+        INNER JOIN customer_grid c on a.GRID_ID = c.ID and c.PID = b.ID  and b.GRID_NAME in
+        <foreach collection="gridNameList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
+        where a.DEL_FLAG= '0'and  a.NEIGHBOR_HOOD_NAME in
+        <foreach collection="neighborNameList" open="(" separator="," close=")" item="val">
+            ${val}
+        </foreach>
     </select>
 
 
+
 </mapper>
\ No newline at end of file