From 6936a1c44480cabc3e1d3bae1ffe366a6b27f830 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 20 Apr 2022 16:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=20=E6=9C=AA=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E6=94=B9=E4=BA=86=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/BuildingServiceImpl.java | 9 ++++++--- .../com/epmet/service/impl/HouseServiceImpl.java | 12 ++++++++---- .../epmet/service/impl/NeighborHoodServiceImpl.java | 3 ++- .../src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) 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 index 20e1d2d4ef..1efa048892 100644 --- 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 @@ -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 listBuilding(IcBuildingListFormDTO formDTO) { - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item -> item.setBuildingType(BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); 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 index bac35ce64c..e4fdaca7e4 100644 --- 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 @@ -168,9 +168,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); + PageInfo pageInfo = null; + if (formDTO.getIsPage()){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) + .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO)); + }else{ + List resultDTOS = icHouseDao.searchHouseByPage(formDTO); + pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size()); + } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> - icHouseDao.searchHouseByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item->{ item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); @@ -205,8 +211,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { Map map = new HashMap<>(); map.put("maplist",icHouseExcels.getList()); ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); - - return ; } @Override 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 ebc6b80744..991469c313 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 @@ -103,7 +103,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //根据组织过滤 formDTO.setAgencyId(formDTO.getId()); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } 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 d4561898a7..a78c7fc3f4 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 @@ -147,7 +147,7 @@ AND a.DEL_FLAG = #{building.delFlag} - + order by a.CREATED_TIME, a.BUILDING_NAME