From 2c5abbd60a84f44781369932925f6051f9f67f0b Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Tue, 13 Jan 2026 11:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=A1=E4=BB=B6=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=9A=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83ID,?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/service/impl/EquipmentServiceImpl.java     |  5 +++--
 .../controller/EquipmentMaintenanceController.java    | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
index c313820f..743691a2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
@@ -63,9 +63,10 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 				.like(Objects.nonNull(equipment.getDeviceName()), EquipmentEntity::getDeviceName, equipment.getDeviceName())
 				.like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory())
 				.like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName())
+				.like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation())
 				.eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed())
-				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac());
-
+				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac())
+				.eq(Objects.nonNull(equipment.getWorkstationId()), EquipmentEntity::getWorkstationId, equipment.getWorkstationId());
 		// 3. 执行分页查询
 		return baseMapper.selectPage(page, wrapper);
 	}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java
index 7994c552..c88ffe44 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java
@@ -1,5 +1,8 @@
 package org.springblade.desk.jobTransfer.controller;
 
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -61,6 +64,14 @@ public class EquipmentMaintenanceController extends BladeController {
      */
     @GetMapping("/page")
     @ApiOperationSupport(order = 3)
+    @Parameters({
+            @Parameter(name = "name", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+            @Parameter(name = "deptId", description = "所属班组", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+            @Parameter(name = "station", description = "所属岗位", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+            @Parameter(name = "skill", description = "技能等级", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+            @Parameter(name = "equipmentId", description = "设备", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+            @Parameter(name = "maintenanceStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+    })
     @Operation(summary = "分页", description = "传入equipmentMaintenance")
     public R<IPage<EquipmentMaintenanceVO>> page(EquipmentMaintenanceVO equipmentMaintenance, Query query) {
         IPage<EquipmentMaintenanceVO> pages = equipmentMaintenanceService.selectEquipmentMaintenancePage(Condition.getPage(query), equipmentMaintenance);