Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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<IcNeighborHoodResultDTO> searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO);
-    List<IcHouseListFormDTO> 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,

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,