From 82f7e51d7b9b474fd828c949da2183fa817885e8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 10:25:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=20=E6=A5=BC=E5=AE=87=20?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=20=E6=8E=92=E5=BA=8F=20=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=20=E6=A5=BC=E5=AE=87=20=20?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E5=90=8D=E7=A7=B0=20=E6=88=BF=E5=B1=8B=20?= =?UTF-8?q?=E5=8D=95=E5=85=83-=E9=97=A8=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 7 +---- .../service/impl/BuildingServiceImpl.java | 18 +------------ .../epmet/service/impl/HouseServiceImpl.java | 27 +------------------ .../service/impl/NeighborHoodServiceImpl.java | 8 ------ .../main/resources/mapper/IcBuildingDao.xml | 4 +-- .../src/main/resources/mapper/IcHouseDao.xml | 1 + .../resources/mapper/IcNeighborHoodDao.xml | 3 ++- 7 files changed, 8 insertions(+), 60 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index ab0b6c646f..dff792d8c6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -32,7 +32,6 @@ import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.excel.IcHouseExcel; import com.epmet.service.HouseService; -import com.epmet.service.NeighborHoodService; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -56,10 +55,6 @@ import java.util.stream.Collectors; @RestController @RequestMapping("house") public class HouseController { - - - @Autowired - private NeighborHoodService neighborHoodService; @Autowired private HouseService houseService; @@ -173,4 +168,4 @@ public class HouseController { Result> queryListHouseInfo(@RequestBody Set houseIds){ return new Result>().ok(houseService.queryListHouseInfo(houseIds)); } -} \ No newline at end of file +} 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 24fe5e520a..512a89c209 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 @@ -365,25 +365,9 @@ public class BuildingServiceImpl implements BuildingService { private IPage> searchBuilding(ListIcNeighborHoodFormDTO formDTO) { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// IcNeighborHoodEntity neighbor = new IcNeighborHoodEntity(); -// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); - - IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); building.setDelFlag("0"); -// QueryWrapper buildingEntityQueryWrapper = new QueryWrapper<>(); -// -// buildingEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId()) -// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); -// buildingEntityQueryWrapper.eq("a.DEL_FLAG","0"); + IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); IPage> mapIPage = icBuildingDao.searchBuildingByPage(page, building, house); List> records = mapIPage.getRecords(); 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 4ff3bb2948..69a2000d97 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 @@ -201,9 +201,7 @@ public class HouseServiceImpl implements HouseService { //3.保存 icHouseService.insertBatch(houseEntityList); - /*if(!"".equals(str)){ - return new Result().error(9999, str.append("不存在").toString()); - }*/ + return numList; } @@ -252,28 +250,6 @@ public class HouseServiceImpl implements HouseService { private IPage> searchHouse(ListIcNeighborHoodFormDTO formDTO) { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - - -// QueryWrapper buildingEntityQueryWrapper = new QueryWrapper<>(); -// buildingEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId()) -// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); -// IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); - - -// QueryWrapper houseEntityQueryWrapper = new QueryWrapper<>(); -// houseEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getOwnerName()),IcHouseEntity::getOwnerName,formDTO.getOwnerName()) -// .like(!StringUtils.isEmpty(formDTO.getOwnerPhone()),IcHouseEntity::getOwnerPhone,formDTO.getOwnerPhone()); -// houseEntityQueryWrapper.eq("a.DEL_FLAG","0"); - IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); house.setDelFlag("0"); @@ -281,7 +257,6 @@ public class HouseServiceImpl implements HouseService { List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); -// item.put("rentFlag", HouseRentFlagEnums.getTypeValue(item.get("rentFlagKey") )); item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey"))); }); return mapIPage; 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 dd5e742342..5c68f83dba 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 @@ -133,14 +133,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0"); - IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); neighbor.setDelFlag("0"); 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 f605b5c71f..a9df36a163 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 @@ -94,7 +94,7 @@ AND a.DEL_FLAG = #{building.delFlag} - order by a.CREATED_TIME asc + order by a.BUILDING_NAME - \ No newline at end of file + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 61aa971630..8b0286d90f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -144,6 +144,7 @@ + ORDER BY d.UNIT_NUM,a.DOOR_NAME - \ No newline at end of file + From 14487d3f70db28aeb72bc299a5e5c04456003ed3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 10:49:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E4=B9=9F?= =?UTF-8?q?=E6=8E=92=E4=B8=80=E4=B8=8B=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 8 +- .../com/epmet/service/BuildingService.java | 8 +- .../service/impl/BuildingServiceImpl.java | 29 +++-- .../main/resources/mapper/IcBuildingDao.xml | 112 ------------------ 4 files changed, 21 insertions(+), 136 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 98b5d1233e..adaa3ed3f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -92,9 +92,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - - buildingService.AddBuilding(customerId,formDTO); + buildingService.addBuilding(customerId,formDTO); return new Result().ok("保存成功"); } @@ -105,7 +103,7 @@ public class BuildingController { ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - buildingService.UpdateBuilding(customerId,formDTO); + buildingService.updateBuilding(customerId,formDTO); return new Result().ok("修改成功"); } @@ -114,7 +112,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class); String buildingId = formDTO.getBuildingId(); - buildingService.DelBuilding(buildingId); + buildingService.delBuilding(buildingId); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 3a78628602..81b70a4bd2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -40,16 +40,16 @@ public interface BuildingService { - void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO); + void updateBuilding(String customerId, IcBulidingFormDTO formDTO); /** * 删除小区 * @param buildingId */ - void DelBuilding(String buildingId); + void delBuilding(String buildingId); - void AddBuilding(String customerId, IcBulidingFormDTO formDTO); + void addBuilding(String customerId, IcBulidingFormDTO formDTO); List treeList(String customerId); @@ -62,4 +62,4 @@ public interface BuildingService { List buildingListByIds(List buildingIdList); BuildingResultPagedDTO buildinglistbyidsPage(List buildingIdList, Integer pageNo, Integer pageSize); -} \ No newline at end of file +} 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 512a89c209..c421861a7c 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 @@ -1,9 +1,11 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -70,7 +72,7 @@ public class BuildingServiceImpl implements BuildingService { @Override @Transactional(rollbackFor = Exception.class) - public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void addBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null); if (null != count && count > 0) { @@ -152,8 +154,10 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 - List gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList)); + List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList); + queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime); + List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); return covertToTree(customerAgency,agencyList); @@ -171,8 +175,11 @@ public class BuildingServiceImpl implements BuildingService { }).collect(Collectors.toList()); //3.获取小区下的所有楼宇 - List neighborHoodIdList = icNeighborHoodList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icBuildingList = icBuildingDao.selectList(new QueryWrapper().lambda().in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)); + List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() + .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) + .orderByAsc(IcBuildingEntity::getBuildingName); + List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ agencyList.addAll(gridList); @@ -193,14 +200,6 @@ public class BuildingServiceImpl implements BuildingService { return buildingTreeLevelDTO; }).collect(Collectors.toList()); - - - - //组织 -// gridList.stream() -// Map> gridMap = gridList.stream().collect(Collectors.groupingBy(e -> e.getPId())); -// List allList = agencyList.addAll(gridList) - agencyList.addAll(gridList); agencyList.addAll(neighbourHoodList); agencyList.addAll(buildingList); @@ -412,7 +411,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void updateBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId()); if (null != count && count > 0) { @@ -468,7 +467,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void DelBuilding(String buildingId) { + public void delBuilding(String buildingId) { //如果存在房屋，无法删除 List icHouseEntities = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, buildingId)); if(!CollectionUtils.isEmpty(icHouseEntities)){ 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 a9df36a163..f3aaa7ba80 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 @@ -138,117 +138,6 @@ - - - - - - - From 8f0b81b16d1d251fca1214d22fefa9bb31122c99 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 12:37:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E5=85=88=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E5=86=8D=E6=8C=89=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=9B=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=B0=86=E5=8D=95=E5=85=83=E5=8F=B7=E8=BD=AC=E4=B8=BA=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 7 ++++--- .../src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- 3 files changed, 6 insertions(+), 5 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 c421861a7c..c51ffbb4f1 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 @@ -155,8 +155,9 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList); - queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .in(IcNeighborHoodEntity::getGridId, gridIdList) + .orderByAsc(IcNeighborHoodEntity::getCreatedTime); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); @@ -178,7 +179,7 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getBuildingName); + .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ 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 f3aaa7ba80..d4f3847235 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 @@ -94,7 +94,7 @@ AND a.DEL_FLAG = #{building.delFlag} - order by a.BUILDING_NAME + order by a.CREATED_TIME, a.BUILDING_NAME