获取仓库区域并行国家、城市、仓库列表排序

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseMapper.java

@@ -143,9 +143,11 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
             "w.title_zh as warehouseTitleZh,",
             "w.title_en as warehouseTitleEn,",
             "r1.id as guojia,",
+            "r1.sort as guojiaSort,",
             "r1.title_zh as guojiaName,",
             "r1.title_en as guojiaNameEn,",
             "r2.id as shi, ",
+            "r2.sort as shiSort, ",
             "r2.title_zh as shiName, ",
             "r2.title_en as shiNameEn ",
             "FROM ecw_warehouse w ",

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java

@@ -577,6 +577,7 @@ public class WarehouseServiceImpl implements WarehouseService {
             v.setShi(m.getKey());
             List<WarehouseTreeVO> warehouseList = m.getValue();
             WarehouseTreeVO warehouseTreeVO = warehouseList.get(0);
+            v.setShiSort(warehouseTreeVO.getShiSort());
             v.setShiName(warehouseTreeVO.getShiName());
             v.setShiNameEn(warehouseTreeVO.getShiNameEn());
             v.setGuojiaNameEn(warehouseTreeVO.getGuojiaNameEn());
@@ -584,7 +585,7 @@ public class WarehouseServiceImpl implements WarehouseService {
             v.setGuojia(warehouseTreeVO.getGuojia());
             shiVOList.add(v);
         }
-        vo.setShiList(shiVOList);
+        vo.setShiList(shiVOList.stream().sorted(Comparator.comparing(WarehouseTreeVO::getShiSort)).collect(Collectors.toList()));
         Map<Long, List<WarehouseTreeVO>> guojiaMap = shiVOList.stream()
                 .collect(Collectors.groupingBy(WarehouseTreeVO::getGuojia));
         List<WarehouseTreeVO> guojiaList = new ArrayList<>();
@@ -595,9 +596,10 @@ public class WarehouseServiceImpl implements WarehouseService {
             WarehouseTreeVO warehouseTreeVO = shiWarehouseList.get(0);
             v.setGuojiaNameEn(warehouseTreeVO.getGuojiaNameEn());
             v.setGuojiaName(warehouseTreeVO.getGuojiaName());
+            v.setGuojiaSort(warehouseTreeVO.getGuojiaSort());
             guojiaList.add(v);
         }
-        vo.setGuojiaList(guojiaList);
+        vo.setGuojiaList(guojiaList.stream().sorted(Comparator.comparing(WarehouseTreeVO::getGuojiaSort)).collect(Collectors.toList()));
         return vo;
     }
 

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseTreeVO.java

@@ -12,12 +12,16 @@ public class WarehouseTreeVO {
 
     @ApiModelProperty("国家区域id")
     private Long guojia;
+    @ApiModelProperty("国家排序")
+    private Integer guojiaSort;
     @ApiModelProperty("国家中文名称")
     private String guojiaName ;
     @ApiModelProperty("国家英文名称")
     private String guojiaNameEn ;
     @ApiModelProperty("城市区域id")
     private Long shi;
+    @ApiModelProperty("城市排序")
+    private Integer shiSort;
     @ApiModelProperty("城市中文名称")
     private String shiName;
     @ApiModelProperty("城市英文名称")
@@ -30,6 +34,8 @@ public class WarehouseTreeVO {
     @ApiModelProperty("仓库英文名称")
     private String warehouseTitleEn;
 
+    @ApiModelProperty("排序")
+    private Integer sort;
 
     @ApiModelProperty(value = "子元素", example = "true")
     private List<WarehouseTreeVO> children;