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 page = siteRegionService.pageSite(pageParam, operationRegionId, zoneId, siteName); + public JsonResult pageSite(@Validated PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) { + Page 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 { * @param siteName 站点名称 * @return 分页列表 */ - Page pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName); + Page 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 pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName) { + public Page 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