From 5b6a844405a8df3748039ca2279369bc19a345de Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 13 Apr 2022 15:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=88=BF=E5=B1=8B=E6=A5=BC?=
 =?UTF-8?q?=E5=AE=87=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=BA=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java      | 6 ++----
 .../src/main/resources/mapper/IcNeighborHoodDao.xml         | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

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 8189d0638b..d2adb6c87f 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
@@ -18,8 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.IcHouseListFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.excel.IcNeighborHoodExcel;
@@ -37,10 +37,8 @@ import java.util.List;
 @Mapper
 public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
 
-//    IPage<Map<String, Object>> searchNeighborhoodByPage(IPage<IcNeighborHoodEntity> page,@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
-    List<IcHouseListFormDTO> searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO);
+    List<IcNeighborHoodResultDTO> searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO);
 
-//    List<IcNeighborHoodExcel> searchAllNeighborhood(@Param(Constants.WRAPPER) QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper);
     List<IcNeighborHoodExcel> searchAllNeighborhood(@Param("neighbor") IcNeighborHoodEntity neighbor, @Param("house")IcHouseEntity house);
 
     List<IcNeighborHoodEntity> selectListByName(@Param("customerId") String customerId,
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 e36c72ca8f..911fae23fd 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
@@ -57,7 +57,7 @@
             </if>
         </where>
     </select>-->
-    <select id="searchNeighborhoodByPage" resultType="com.epmet.dto.form.IcHouseListFormDTO">
+    <select id="searchNeighborhoodByPage" resultType="com.epmet.dto.result.IcNeighborHoodResultDTO">
         select
             a.id as neighborHoodId,
             a.NEIGHBOR_HOOD_NAME as neighborHoodName,