Commit 8dc8de09d57e620684844afe5f953bb7532d041e
1 parent
47a68f61
fix: 优化查询结果
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 { | @@ -263,18 +263,13 @@ public class SchedulingService { | ||
| 263 | if (list.size() < stage) { | 263 | if (list.size() < stage) { |
| 264 | return true; | 264 | return true; |
| 265 | } | 265 | } |
| 266 | - | ||
| 267 | - if (Objects.isNull(list.get(stage - 1).getSignTime())) { | ||
| 268 | - return false; | ||
| 269 | - } | ||
| 270 | - | ||
| 271 | DriverScheduling scheduling = list.get(stage - 1); | 266 | DriverScheduling scheduling = list.get(stage - 1); |
| 272 | // 获取两个 Date 对象之间的时间差（以毫秒为单位） | 267 | // 获取两个 Date 对象之间的时间差（以毫秒为单位） |
| 273 | - long timeDifferenceInMillis = scheduling.getSignTime().getTime() - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT()); | 268 | + long signTime = scheduling.getSignTime() == null ? System.currentTimeMillis() : scheduling.getSignTime().getTime(); |
| 269 | + long timeDifferenceInMillis = signTime - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT()); | ||
| 270 | + long diffTime = 60 * 1000 * 15; | ||
| 274 | // 相差十五分钟 | 271 | // 相差十五分钟 |
| 275 | - if (timeDifferenceInMillis > 0 && timeDifferenceInMillis < (60 * 1000 * 15)) { | ||
| 276 | - return true; | ||
| 277 | - } else if (timeDifferenceInMillis <= 0) { | 272 | + if (timeDifferenceInMillis <= diffTime) { |
| 278 | return true; | 273 | return true; |
| 279 | } | 274 | } |
| 280 | return false; | 275 | return false; |