From f9d4b2c406a03bbdca45922764d93fec2e9b84c6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 7 May 2022 10:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E6=A0=91=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/IcBuildingDao.xml | 1 + 2 files changed, 7 insertions(+), 3 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 4e8ccd0e93..3476d797d1 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 @@ -157,7 +157,10 @@ public class BuildingServiceImpl implements BuildingService { //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); // agencyIdList.add(customerAgency.getId()); - List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + LambdaQueryWrapper gridWrapper = new LambdaQueryWrapper<>(); + gridWrapper.in(CustomerGridEntity::getPid, agencyIdList); + gridWrapper.last("ORDER BY CAST(gridName AS SIGNED),CONVERT(gridName using gbk)"); + List customerGridList = customerGridDao.selectList(gridWrapper); if (CollectionUtils.isEmpty(customerGridList)) { return covertToTree(customerAgency, agencyList); @@ -182,7 +185,7 @@ public class BuildingServiceImpl implements BuildingService { List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if (CollectionUtils.isEmpty(icNeighborHoodList)) { agencyList.addAll(gridList); @@ -206,7 +209,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::getCreatedTime, IcBuildingEntity::getBuildingName); + .last("ORDER BY SORT, CAST(BUILDING_NAME AS SIGNED),CONVERT(BUILDING_NAME USING gbk)"); 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 2cc2fcd73f..7387a73354 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 @@ -186,6 +186,7 @@ ca.del_flag = '0' and CONCAT(':',ca.pids, ':') like CONCAT('%:',#{agencyId},':%') + ORDER BY CAST(organization_name AS SIGNED),CONVERT(organization_name using gbk)