From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 6308a3a..655df90 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
@@ -252,6 +252,29 @@
 	 }
 
 
+	 @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+	 @GetMapping(value = "/queryEquipmentList")
+	 public Result<IPage<Equipment>> queryEquipmentList(Equipment equipment,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		 QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+		 if(StringUtils.isNotBlank(equipment.getNum())){
+			 queryWrapper.like("num",equipment.getNum());
+		 }
+		 if(StringUtils.isNotBlank(equipment.getName())){
+			 queryWrapper.like("name",equipment.getName());
+		 }
+		 queryWrapper.eq("use_id",equipment.getUseId());
+		 queryWrapper.eq("del_flag",0);
+		 queryWrapper.orderByDesc("create_time");
+
+		 Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+		 IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
 	 /**
 	  * 璁惧淇濅慨  鑾峰彇璁惧鍒楄〃缁勪欢
 	  * qsw 2023-7-14

--
Gitblit v1.9.3