From 6170908b69269ee14eae05787eafe682fda00eef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 八月 2023 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
index afd2879..bf35b7b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
@@ -84,18 +84,21 @@
})
@GetMapping("/metering_table")
public Result<?> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit){
+ pageNo = (pageNo - 1) * pageSize;
Map<String, Object> maps = meteringPlanService.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
return Result.success(maps);
}
@ApiOperation(value = "璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�")
@ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "measureId", value = "璁￠噺Id", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "accountOrPlan", value = "true涓哄彴璐false涓鸿鍒�", dataTypeClass = Boolean.class, required = true),
})
@GetMapping("/list_record")
- public Result<?> standingBook(Integer measureId, Boolean accountOrPlan){
- Object maps = meteringPlanService.standingBook(measureId, accountOrPlan);
+ public Result<?> standingBook(Integer pageNo, Integer pageSize, Integer measureId, Boolean accountOrPlan){
+ Object maps = meteringPlanService.standingBook(pageNo, pageSize, measureId, accountOrPlan);
return Result.success(maps);
}
--
Gitblit v1.9.3