From 6ac788f8ff1ce10c2ea55b3b4105ab7fed9c67cd Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 27 Apr 2026 14:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8C=89id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/controller/EquipmentController.java | 1 + .../org/springblade/desk/device/mapper/EquipmentMapper.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java index fb21e005..f4c4b685 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java @@ -97,6 +97,7 @@ public class EquipmentController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "") @Parameters({ + @Parameter(name = "id", description = "设备ID", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")), @Parameter(name = "deviceCode", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "deviceName", description = "设备名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "category", description = "设备分类", in = ParameterIn.QUERY, schema = @Schema(type = "string")), diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml index 32681eef..97ae2a4e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml @@ -44,6 +44,9 @@ wc.WC_NAME as workCenterName from MES_EQUIPMENT e LEFT JOIN BS_WORK_CENTER wc ON e.WORK_CENTER_ID = wc.ID WHERE e.IS_DELETED = 0 + + AND e.ID = #{equipment.id} + AND e.DEVICE_CODE LIKE CONCAT('%', CONCAT(#{equipment.deviceCode}, '%'))