From 8f0b81b16d1d251fca1214d22fefa9bb31122c99 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Dec 2021 12:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=AE=87=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=20=E5=85=88=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20=E5=86=8D=E6=8C=89=E6=A5=BC=E5=AE=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=9B=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F=E5=B0=86?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E5=8F=B7=E8=BD=AC=E4=B8=BA=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=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<String> gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
-        LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList);
-        queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime);
+        LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda()
+                .in(IcNeighborHoodEntity::getGridId, gridIdList)
+                .orderByAsc(IcNeighborHoodEntity::getCreatedTime);
         List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
         if(CollectionUtils.isEmpty(icNeighborHoodList)){
             agencyList.addAll(gridList);
@@ -178,7 +179,7 @@ public class BuildingServiceImpl implements BuildingService {
         List<String> neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<IcBuildingEntity> buildingQueryWrapper = new QueryWrapper<IcBuildingEntity>().lambda()
                 .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)
-                .orderByAsc(IcBuildingEntity::getBuildingName);
+                .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName);
         List<IcBuildingEntity> 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}
             </if>
         </where>
-        order by a.BUILDING_NAME
+        order by a.CREATED_TIME, a.BUILDING_NAME
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select
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 8b0286d90f..37d56c5ec4 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,7 +144,7 @@
             </if>
 
         </where>
-        ORDER BY  d.UNIT_NUM,a.DOOR_NAME
+        ORDER BY  CAST(d.UNIT_NUM AS SIGNED), a.DOOR_NAME
     </select>
     <select id="searchAllHouse" resultType="com.epmet.excel.IcHouseExcel">
         select