优化一房一户导出

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -597,19 +597,23 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resiParam.setCustomerId(tokenDto.getCustomerId());
         resiParam.setAgencyId(formDTO.getAgencyId());
         resiParam.setGridId(formDTO.getGridId());
-        resiParam.setPageSize(NumConstant.ONE_THOUSAND);
+        resiParam.setPageSize(NumConstant.TEN_THOUSAND);
         resiParam.setIsPage(false);
 
-        //查询级别 默认按照小区去查
+        //查询级别 默认按照房屋的组织去查
         int searchLevel = 0;
 
+        //如果小区id不为空 则直接查询小区内的居民
+        if (StringUtils.isNotEmpty(formDTO.getNeighborHoodId())){
+            searchLevel = 1;
+        }
         //如果楼宇id不为空 则直接查询楼宇内的居民
         if (StringUtils.isNotEmpty(formDTO.getBuildingId())){
-            searchLevel = 1;
+            searchLevel = 2;
         }
-        //如果有具体的查询套件 则直接降级为2 按照房屋Id 来查
+        //如果有具体的查询套件 则直接按照房屋Id 来查
         if (StringUtils.isNotEmpty(formDTO.getOwnerName()) || StringUtils.isNotEmpty(formDTO.getOwnerPhone()) || StringUtils.isNotEmpty(formDTO.getRentFlag())){
-            searchLevel = 2;
+            searchLevel = 3;
         }
 
         PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
@@ -620,12 +624,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
 
         houseData.getList().forEach(o ->{
-
-            resiParam.setNeighborHoodId(o.getNeighborHoodId());
+            resiParam.setAgencyId(o.getAgencyId());
             if (finalSearchLevel == 1){
-                resiParam.setBuildingId(o.getBuildingId());
+                resiParam.setNeighborHoodId(o.getNeighborHoodId());
             }
             if (finalSearchLevel == 2){
+                resiParam.setBuildingId(o.getBuildingId());
+            }
+            if (finalSearchLevel == 3){
                 resiParam.setHouseId(o.getHouseId());
             }
             this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache);