From b24757a1f840994defa2e68591b5da4d5e67e7be Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 16 Jan 2026 13:28:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=83=BD=E5=B7=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/EquipmentMaintenanceQuery.java | 5 +++++ .../jobTransfer/mapper/EquipmentMaintenanceMapper.xml | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java index 1a6e9b01..11ce3860 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java @@ -39,4 +39,9 @@ public class EquipmentMaintenanceQuery { */ @Schema(description = "维护状态(1正常,2到期,3离职)") private Short maintenanceStatus; + /** + * 多能工 + */ + @Schema(description = "多能工") + private Boolean pleuripotent; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml index afab02e0..f7df004a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml @@ -134,6 +134,15 @@ AND em.maintenance_status = #{query.maintenanceStatus} + + AND ph.id IN ( + SELECT em_inner.ph_id + FROM MES_EQUIPMENT_MAINTENANCE em_inner + WHERE em_inner.is_deleted = 0 + GROUP BY em_inner.ph_id + HAVING COUNT(em_inner.id) >= 2 + ) + ORDER BY ph.create_time DESC, em.equipment_date DESC