From 23136e0e494622871e9b8ecfb85619e29f71e284 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Fri, 17 Apr 2026 11:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B2=97=E4=BD=8D=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml | 4 +++- .../desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml index 856a1884..13efcddc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml @@ -127,12 +127,14 @@ ct.name as certificate_type_name, ct.validity_period as validity_period, ct.airworthiness_validity_period as airworthiness_validity_period, - ct.astronaut_validity_period as astronaut_validity_period + ct.astronaut_validity_period as astronaut_validity_period, + bp.POST_NAME as STATION_NAME -- 岗位名称 FROM MES_POST_HANDLE ph LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID LEFT JOIN BLADE_DEPT bd ON ph.DEPT_ID = bd.ID LEFT JOIN MES_CERTIFICATE_MAINTENANCE cm ON ph.id = cm.ph_id AND cm.is_deleted = 0 LEFT JOIN MES_CERTIFICATE_TYPE ct ON cm.certificate_id = ct.id AND ct.is_deleted = 0 + LEFT JOIN BLADE_POST bp ON ph.STATION = bp.ID -- 关联岗位表 WHERE ph.is_deleted = 0 and ph.staff_type != 1 AND ph.name LIKE CONCAT(CONCAT('%', #{query.name}), '%') 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 f3ca9248..e2cebaee 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 @@ -106,12 +106,14 @@ em.maintenance_status, equipment.device_name, equipment.device_code, - equipment.mac_spec + equipment.mac_spec, + bp.POST_NAME as STATION_NAME -- 岗位名称 FROM MES_POST_HANDLE ph LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID LEFT JOIN BLADE_DEPT bd ON ph.DEPT_ID = bd.ID LEFT JOIN MES_EQUIPMENT_MAINTENANCE em ON ph.id = em.ph_id AND em.is_deleted = 0 LEFT JOIN MES_EQUIPMENT equipment ON em.equipment_id = equipment.id AND equipment.is_deleted = 0 + LEFT JOIN BLADE_POST bp ON ph.STATION = bp.ID -- 关联岗位表 WHERE ph.is_deleted = 0 and ph.staff_type != 1 AND ph.name LIKE CONCAT(CONCAT('%', #{query.name}), '%')