root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(page): 修复 分页参数

Browse Source
This commit is contained in:
han0
2023-12-22 16:20:40 +08:00
parent 564f6177ab
commit 15b8f6ad9d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/mjkf/xinke/main/controller/BudgetController.java
View File

@@ -75,15 +75,15 @@ public class BudgetController {
@ApiOperation("查询预算") @ApiOperation("查询预算")
@GetMapping("/") @GetMapping("/")
public HttpResponse list ( public HttpResponse list (
@ApiParam("每页数量") @RequestParam(name = "limit", defaultValue = "10") Integer limit, @ApiParam(value = "每页数量") @RequestParam(name = "size", required = false, defaultValue = "10") Integer size,
@ApiParam("页码") @RequestParam(name = "page", defaultValue = "1") Integer page, @ApiParam(value = "页码") @RequestParam(name = "current", required = false, defaultValue = "1") Integer current,
@ApiParam(value = "名称") @RequestParam(value="name") String name @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name
) throws Exception { ) throws Exception {
var query = new LambdaQueryWrapper<Budget>(); var query = new LambdaQueryWrapper<Budget>();
if (!ObjectUtils.isEmpty(name)) { if (!ObjectUtils.isEmpty(name)) {
query.like(Budget::getName, 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(); return FuHttpResponse.Builder().dataResponse(result).build();
} }

6
src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java
View File

@@ -34,8 +34,8 @@ public class MaterialTaskController {
@ApiOperation("获取采集任务列表") @ApiOperation("获取采集任务列表")
@GetMapping("/") @GetMapping("/")
public CommonResult<Page<MaterialTask>> list( public CommonResult<Page<MaterialTask>> list(
@ApiParam("每页数量") @RequestParam(name = "limit", defaultValue = "10") Integer limit, @ApiParam(value = "每页数量") @RequestParam(name = "size", required = false, defaultValue = "10") Integer size,
@ApiParam("页码") @RequestParam(name = "page", defaultValue = "1") Integer page, @ApiParam(value = "页码") @RequestParam(name = "current", required = false, defaultValue = "1") Integer current,
@ApiParam("任务类型") Integer type, @ApiParam("任务类型") Integer type,
@ApiParam("关键字") @RequestParam(name = "key_word", required = false) String keyWord, @ApiParam("关键字") @RequestParam(name = "key_word", required = false) String keyWord,
@ApiParam("月份") Integer month @ApiParam("月份") Integer month
@@ -46,7 +46,7 @@ public class MaterialTaskController {
if (keyWord != null) { if (keyWord != null) {
query.like(MaterialTask::getName, keyWord); 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); return CommonResult.data(result);
} }