fix: 优化查询结果

guzijian
1 parent 47a68f61
Showing 1 changed file with 4 additions and 9 deletions
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
@@ -263,18 +263,13 @@ public class SchedulingService {
         if (list.size() < stage) {
             return true;
         }
-
-        if (Objects.isNull(list.get(stage - 1).getSignTime())) {
-            return false;
-        }
-
         DriverScheduling scheduling = list.get(stage - 1);
         // 获取两个 Date 对象之间的时间差（以毫秒为单位）
-        long timeDifferenceInMillis = scheduling.getSignTime().getTime() - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT());
+        long signTime = scheduling.getSignTime() == null ? System.currentTimeMillis() : scheduling.getSignTime().getTime();
+        long timeDifferenceInMillis = signTime - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT());
+        long diffTime = 60 * 1000 * 15;
         // 相差十五分钟
-        if (timeDifferenceInMillis > 0 && timeDifferenceInMillis < (60 * 1000 * 15)) {
-            return true;
-        } else if (timeDifferenceInMillis <= 0) {
+        if (timeDifferenceInMillis <= diffTime) {
             return true;
         }
         return false;