From 9cd3f9db959e4f1a468f27687d65e9942c1c4ac6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 10 四月 2024 20:39:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index caca48f..62f533e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -64,16 +64,6 @@
return R.ok().add(mats);
}
- @RequestMapping(value = "/mat/list/pda/page/auth")
- @ManagerAuth
- public R pdaPageList(@RequestParam(required = true)Long tagId,
- @RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit){
- EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- wrapper.eq("tag_id", tagId);
- wrapper.orderBy("create_time", false);
- return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
- }
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
@@ -85,6 +75,16 @@
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
return R.ok().add(mats);
+ }
+ @RequestMapping(value = "/mat/list/pda/page/auth")
+ @ManagerAuth
+ public R pdaPageList(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.eq("tag_id", tagId);
+ wrapper.orderBy("create_time", false);
+ return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/mat/{id}/auth")
@@ -113,7 +113,8 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("batch"))
);
}
--
Gitblit v1.9.1