导出bug 未发现改了改

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

@@ -54,9 +54,11 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -299,7 +301,8 @@ public class BuildingServiceImpl implements BuildingService {
 
     @Override
     public PageData<IcBuildingListResultDTO> listBuilding(IcBuildingListFormDTO formDTO) {
-        PageInfo<IcBuildingListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO));
+        PageInfo<IcBuildingListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
+                .doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO));
         List<IcBuildingListResultDTO> records = pageInfo.getList();
         records.forEach(item -> item.setBuildingType(BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey())));
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());

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

@@ -168,9 +168,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             pids = getPids(formDTO.getAgencyId());
         }
         formDTO.setPids(pids);
+        PageInfo<IcHouseListResultDTO> pageInfo = null;
+        if (formDTO.getIsPage()){
+            pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage())
+                    .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO));
+        }else{
+            List<IcHouseListResultDTO> resultDTOS = icHouseDao.searchHouseByPage(formDTO);
+            pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size());
+        }
 
-        PageInfo<IcHouseListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() ->
-                icHouseDao.searchHouseByPage(formDTO));
         List<IcHouseListResultDTO> records = pageInfo.getList();
         records.forEach(item->{
             item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey()));
@@ -205,8 +211,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         Map<String,Object> map = new HashMap<>();
         map.put("maplist",icHouseExcels.getList());
         ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response);
-
-        return ;
     }
 
     @Override

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

@@ -103,7 +103,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
             //根据组织过滤
             formDTO.setAgencyId(formDTO.getId());
         }
-        PageInfo<IcNeighborHoodResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO));
+        PageInfo<IcNeighborHoodResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
+                .doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO));
         return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -147,7 +147,7 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-
+        order by a.CREATED_TIME, a.BUILDING_NAME
     </select>
 
     <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -143,6 +143,7 @@
                 AND a.DEL_FLAG = #{neighbor.delFlag}
             </if>
         </where>
+         ORDER BY a.CREATED_TIME
     </select>
     <!--<select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select