From 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
index 8dd51eb..3814183 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
@@ -39,14 +39,6 @@
@Autowired
private FinishedInspectService finishedInspectService;
- @Autowired
- private UserService userService;
-
- @Autowired
- private SpecificationsService specificationsService;
-
- @Autowired
- private MaterialService materialService;
@Autowired
Jwt jwt;
@@ -94,14 +86,14 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "result", value = "妫�楠岀粨鏋�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "material", value = "浜у搧鍚嶇О", dataTypeClass = String.class)
})
@GetMapping("/list_page")
- public Result<?> list_page(Integer pageNo, Integer pageSize, Integer result, String material) {
- IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageNo, pageSize), result, material);
+ public Result<?> list_page(Integer pageSize, Integer countSize, Integer result, String material) {
+ IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageSize, countSize), result, material);
Map<String, Object> map = new HashMap<>();
map.put("total", page.getTotal());
map.put("row", page.getRecords());
--
Gitblit v1.9.3