楼栋房屋小区排序

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

@@ -180,7 +180,7 @@ public class BuildingServiceImpl implements BuildingService {
         List<String> gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda()
                 .in(IcNeighborHoodEntity::getGridId, gridIdList)
-                .orderByAsc(IcNeighborHoodEntity::getCreatedTime);
+                .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)");
         List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
         if(CollectionUtils.isEmpty(icNeighborHoodList)){
             agencyList.addAll(gridList);
@@ -204,7 +204,8 @@ 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::getCreatedTime,IcBuildingEntity::getBuildingName);
+                .last("ORDER BY CAST(BUILDING_NAME AS SIGNED), CONVERT(BUILDING_NAME using gbk)");
+                //.orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName);
         List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(buildingQueryWrapper);
 
         if(CollectionUtils.isEmpty(neighborHoodIdList)){

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

@@ -120,7 +120,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         }
         LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId);
-        wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY CAST(BUILDING_NAME AS SIGNED),CONVERT ( BUILDING_NAME USING gbk ) ASC");
         List<IcBuildingEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

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

@@ -118,7 +118,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
-        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk )");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
@@ -160,7 +160,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         //查询楼栋下房屋列表
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId());
-        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk ), CONVERT ( HOUSE_NAME USING gbk ) ASC");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

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

@@ -194,7 +194,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId);
         wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId);
-        wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)");
         List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

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

@@ -106,7 +106,9 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+        order by
+            CAST(a.BUILDING_NAME AS SIGNED),
+            CONVERT(a.BUILDING_NAME using gbk)
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select

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

@@ -142,7 +142,8 @@
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
         ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
-        CONVERT(b.BUILDING_NAME USING gbk),
+        CAST(b.BUILDING_NAME AS SIGNED),
+        CONVERT(b.BUILDING_NAME using gbk),
         CONVERT(d.UNIT_NAME USING gbk),
         CAST(a.DOOR_NAME AS SIGNED),
         CONVERT(a.DOOR_NAME using gbk)