From c2dbde3d4826946e7a40fff6efeb08547e4ab75a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 14:22:37 +0800
Subject: [PATCH] art: 设备台账-分页查询修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 748d86a..c49ecfe 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -12,6 +12,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.mdc.entity.MdcEquipment;
@@ -48,19 +49,17 @@
* @param eamEquipment
* @param pageNo
* @param pageSize
- * @param req
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
+// @AutoLog(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamEquipment eamEquipment,
+ public Result<?> queryPageList(EamEquipmentQuery eamEquipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
- Page<EamEquipment> page = new Page<EamEquipment>(pageNo, pageSize);
- IPage<EamEquipment> pageList = eamEquipmentService.page(page, queryWrapper);
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+// QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
+ IPage<EamEquipment> page = new Page<>(pageNo, pageSize);
+ IPage<EamEquipment> pageList = eamEquipmentService.queryPageList(page, eamEquipment);
return Result.OK(pageList);
}
@@ -70,7 +69,7 @@
* @param eamEquipment
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-娣诲姞")
+// @AutoLog(value = "璁惧鍙拌处-娣诲姞")
@ApiOperation(value = "璁惧鍙拌处-娣诲姞", notes = "璁惧鍙拌处-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamEquipment eamEquipment) {
@@ -96,7 +95,6 @@
* @param eamEquipment
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-缂栬緫")
@ApiOperation(value = "璁惧鍙拌处-缂栬緫", notes = "璁惧鍙拌处-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamEquipment eamEquipment) {
@@ -110,7 +108,6 @@
* @param id
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-閫氳繃id鍒犻櫎")
@ApiOperation(value = "璁惧鍙拌处-閫氳繃id鍒犻櫎", notes = "璁惧鍙拌处-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
@@ -124,7 +121,6 @@
* @param ids
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-鎵归噺鍒犻櫎")
@ApiOperation(value = "璁惧鍙拌处-鎵归噺鍒犻櫎", notes = "璁惧鍙拌处-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -138,7 +134,6 @@
* @param id
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-閫氳繃id鏌ヨ")
@ApiOperation(value = "璁惧鍙拌处-閫氳繃id鏌ヨ", notes = "璁惧鍙拌处-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -169,7 +164,6 @@
return super.importExcel(request, response, EamEquipment.class);
}
- @AutoLog(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
@ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
@GetMapping(value = "/loadTreeListByProductionIds")
public Result<List<EamEquipmentTree>> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {
--
Gitblit v1.9.3