From 09d45118dfc456f41ef60dc1d3dcf50d2882e2f2 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 15 May 2025 14:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/ebikeoperate/controller/EbikeRegionController.java | 6 ++++--
 .../cdzy/ebikeoperate/service/EbikeSiteRegionService.java   | 2 +-
 .../service/impl/EbikeSiteRegionServiceImpl.java            | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
index 5851a9b0..2a3c4ec5 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
@@ -195,11 +195,13 @@ public class EbikeRegionController {
      * 分页查询站点。
      *
      * @param pageParam 分页参数
+     * @param borrowingSort 借车单量排序：1、升序；2、降序
+     * @param returnSort 还车单量排序：1、升序；2、降序
      * @return {@code 200} 添加成功，{@code 500} 添加失败
      */
     @GetMapping("pageSite")
-    public JsonResult<?> pageSite(@Validated PageParam pageParam, Long operationRegionId, String zoneId, String siteName) {
-        Page<ResEbikeSiteRegionPageDto> page = siteRegionService.pageSite(pageParam, operationRegionId, zoneId, siteName);
+    public JsonResult<?> pageSite(@Validated PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) {
+        Page<ResEbikeSiteRegionPageDto> page = siteRegionService.pageSite(pageParam, operationRegionId, zoneId, siteName,borrowingSort,returnSort);
         return JsonResult.success(page);
     }
 
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
index 0fbc7a58..6497bf3c 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
@@ -60,7 +60,7 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
      * @param siteName 站点名称
      * @return 分页列表
      */
-    Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName);
+    Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort);
 
     /**
      * 站点附件上传
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
index 00139b11..b0930ad0 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
@@ -205,7 +205,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
     }
 
     @Override
-    public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName) {
+    public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SITE_TYPE.SITE_TYPE_NAME)
                 .leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_SITE_REGION.OPERATION_REGION_ID))
@@ -215,7 +215,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
                 .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
                 .where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId)))
                 .where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)))
-                .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)));
+                .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)))
+                .orderBy(EBIKE_SITE_REGION.BORROWING_ORDER,borrowingSort == 1)
+                .orderBy(EBIKE_SITE_REGION.RETURN_ORDER,returnSort == 1);
         return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class);
     }