人员设备台账与人员证书台账，提前一个月到期

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,

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