设备管理

airport-common/src/main/java/com/sundot/airport/common/utils/EquipmentDateUtils.java

@@ -28,7 +28,7 @@ public class EquipmentDateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 判断输入日期是否晚于当前日期，且在两周(14天)以内
-     * 逻辑：输入日期 > 今天 且 输入日期 <= 今天+14天
+     * 逻辑：输入日期 >= 今天 且 输入日期 <= 今天+14天
      */
     public static boolean isWithinTwoWeeks(Date inputDate) {
         if (inputDate == null) return false;
@@ -39,7 +39,7 @@ public class EquipmentDateUtils extends org.apache.commons.lang3.time.DateUtils
 
         // isAfter 不包含等于，所以如果今天不算"晚于"，用 isAfter
         // 如果包含今天之后的第一天，逻辑如下：
-        boolean isAfterToday = inputLocalDate.isAfter(today);
+        boolean isAfterToday = !inputLocalDate.isBefore(today);
         boolean isWithinRange = !inputLocalDate.isAfter(twoWeeksLater); // 小于等于两周后
 
         return isAfterToday && isWithinRange;
@@ -47,7 +47,7 @@ public class EquipmentDateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 判断输入日期是否晚于当前日期，且在一个月(30天)以内
-     * 逻辑：输入日期 > 今天 且 输入日期 <= 今天+30天
+     * 逻辑：输入日期 >= 今天 且 输入日期 <= 今天+30天
      */
     public static boolean isWithinOneMonth(Date inputDate) {
         if (inputDate == null) return false;
@@ -56,7 +56,7 @@ public class EquipmentDateUtils extends org.apache.commons.lang3.time.DateUtils
         LocalDate today = LocalDate.now(ZONE_ID);
         LocalDate oneMonthLater = today.plusDays(30); // 或者 plusMonths(1)，视业务需求定
 
-        boolean isAfterToday = inputLocalDate.isAfter(today);
+        boolean isAfterToday = !inputLocalDate.isBefore(today);
         boolean isWithinRange = !inputLocalDate.isAfter(oneMonthLater);
 
         return isAfterToday && isWithinRange;

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -184,7 +184,7 @@
                 <!-- 使用状态=在用 + 一月内 -->
                 <when test="'YELLOW'.equals(colorType)">
                     AND usage_status = 'IN_USE'
-                    AND next_inspection_due_date <![CDATA[ >= ]]> CURDATE()
+                    AND next_inspection_due_date <![CDATA[ > ]]> DATE_ADD(CURDATE(), INTERVAL 14 DAY)
                     AND next_inspection_due_date <![CDATA[ <= ]]> DATE_ADD(CURDATE(), INTERVAL 30 DAY)
                 </when>