From 15b8f6ad9d60918e42fe29b995934331cd5b4eb2 Mon Sep 17 00:00:00 2001 From: han0 Date: Fri, 22 Dec 2023 16:20:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(page):=20=E4=BF=AE=E5=A4=8D=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/controller/BudgetController.java | 8 ++++---- .../xinke/main/controller/MaterialTaskController.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/BudgetController.java b/src/main/java/mjkf/xinke/main/controller/BudgetController.java index 6ce92f6..ed12b2d 100644 --- a/src/main/java/mjkf/xinke/main/controller/BudgetController.java +++ b/src/main/java/mjkf/xinke/main/controller/BudgetController.java @@ -75,15 +75,15 @@ public class BudgetController { @ApiOperation("查询预算") @GetMapping("/") public HttpResponse list ( - @ApiParam("每页数量") @RequestParam(name = "limit", defaultValue = "10") Integer limit, - @ApiParam("页码") @RequestParam(name = "page", defaultValue = "1") Integer page, - @ApiParam(value = "名称") @RequestParam(value="name") String name + @ApiParam(value = "每页数量") @RequestParam(name = "size", required = false, defaultValue = "10") Integer size, + @ApiParam(value = "页码") @RequestParam(name = "current", required = false, defaultValue = "1") Integer current, + @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name ) throws Exception { var query = new LambdaQueryWrapper(); if (!ObjectUtils.isEmpty(name)) { query.like(Budget::getName, name); } - var result = budgetService.page(new Page<>(page, limit), query); + var result = budgetService.page(new Page<>(current, size), query); return FuHttpResponse.Builder().dataResponse(result).build(); } diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java index 478bfdc..d40a494 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java @@ -34,8 +34,8 @@ public class MaterialTaskController { @ApiOperation("获取采集任务列表") @GetMapping("/") public CommonResult> list( - @ApiParam("每页数量") @RequestParam(name = "limit", defaultValue = "10") Integer limit, - @ApiParam("页码") @RequestParam(name = "page", defaultValue = "1") Integer page, + @ApiParam(value = "每页数量") @RequestParam(name = "size", required = false, defaultValue = "10") Integer size, + @ApiParam(value = "页码") @RequestParam(name = "current", required = false, defaultValue = "1") Integer current, @ApiParam("任务类型") Integer type, @ApiParam("关键字") @RequestParam(name = "key_word", required = false) String keyWord, @ApiParam("月份") Integer month @@ -46,7 +46,7 @@ public class MaterialTaskController { if (keyWord != null) { query.like(MaterialTask::getName, keyWord); } - var result = materialTaskService.page(new Page<>(page, limit), query); + var result = materialTaskService.page(new Page<>(current, size), query); return CommonResult.data(result); }