From 0ad94aa61d4d57ffe29284be5fad6c54f8b2da4e Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 17 Apr 2026 19:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AE=BE=E5=A4=87=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E4=B8=8E=E4=BA=BA=E5=91=98=E8=AF=81=E4=B9=A6=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=EF=BC=8C=E6=8F=90=E5=89=8D=E4=B8=80=E4=B8=AA=E6=9C=88?= =?UTF-8?q?=E5=88=B0=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobtransfer/mapper/CertificateMaintenanceMapper.xml | 9 ++++++--- .../jobtransfer/mapper/EquipmentMaintenanceMapper.xml | 3 ++- 2 files changed, 8 insertions(+), 4 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 fdb56cfe..2c52ed1b 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 @@ -182,20 +182,23 @@ CASE WHEN m.CERTIFICATE_DATE IS NOT NULL AND ct.VALIDITY_PERIOD IS NOT NULL THEN CASE - WHEN m.CERTIFICATE_DATE + NUMTOYMINTERVAL(ct.VALIDITY_PERIOD, 'YEAR') < + WHEN m.CERTIFICATE_DATE + NUMTOYMINTERVAL(ct.VALIDITY_PERIOD, 'YEAR') - + NUMTOYMINTERVAL(1, 'MONTH') < SYSDATE THEN 2 ELSE 1 END WHEN m.AIRWORTHINESS_DATE IS NOT NULL AND ct.AIRWORTHINESS_VALIDITY_PERIOD IS NOT NULL THEN CASE WHEN m.AIRWORTHINESS_DATE + - NUMTOYMINTERVAL(ct.AIRWORTHINESS_VALIDITY_PERIOD, 'YEAR') < SYSDATE + NUMTOYMINTERVAL(ct.AIRWORTHINESS_VALIDITY_PERIOD, 'YEAR') - + NUMTOYMINTERVAL(1, 'MONTH') < SYSDATE THEN 2 ELSE 1 END WHEN m.ASTRONAUT_DATE IS NOT NULL AND ct.ASTRONAUT_VALIDITY_PERIOD IS NOT NULL THEN CASE WHEN m.ASTRONAUT_DATE + - NUMTOYMINTERVAL(ct.ASTRONAUT_VALIDITY_PERIOD, 'YEAR') < SYSDATE THEN 2 + NUMTOYMINTERVAL(ct.ASTRONAUT_VALIDITY_PERIOD, 'YEAR') - + NUMTOYMINTERVAL(1, 'MONTH') < SYSDATE THEN 2 ELSE 1 END ELSE 1 END, 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 e764c0bb..66e920b1 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 @@ -160,7 +160,8 @@ UPDATE MES_EQUIPMENT_MAINTENANCE SET MAINTENANCE_STATUS = CASE WHEN EQUIPMENT_DATE + - NUMTOYMINTERVAL(EQUIPMENT_VALIDITY_PERIOD, 'YEAR') < SYSDATE + NUMTOYMINTERVAL(EQUIPMENT_VALIDITY_PERIOD, 'YEAR') - + NUMTOYMINTERVAL(1, 'MONTH') < SYSDATE THEN 2 ELSE 1 END, UPDATE_TIME = SYSDATE