运单预警

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnInfoServiceImpl.java

@@ -134,13 +134,10 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
 
         LocalDateTime beginTime = vehicleWarnInfo.getTakeTime();
         LocalDateTime endTime = LocalDateTime.now();
-        if (orderChild.getArriveSendTime() != null) {endTime = orderChild.getArriveSendTime();}
-        if (orderChild.getLoadTime() != null) {endTime = orderChild.getLoadTime();}
-        if (orderChild.getArriveReceiveTime() != null) {endTime = orderChild.getArriveReceiveTime();}
-        if (orderChild.getUnloadTime() != null) {endTime = orderChild.getUnloadTime();}
-        if (orderChild.getConfirmTime() != null) {endTime = orderChild.getConfirmTime();}
-        if (orderChild.getSettleTime() != null) {endTime = orderChild.getSettleTime();}
-        if (orderChild.getFinishTime() != null) {endTime = orderChild.getFinishTime();}
+        if (orderChild.getUnloadTime() != null || orderChild.getFinishTime() != null){
+            if (orderChild.getUnloadTime() != null) {endTime = orderChild.getUnloadTime();}
+            if (orderChild.getFinishTime() != null) {endTime = orderChild.getFinishTime();}
+        }
         if (endTime.isAfter(beginTime.plusDays(TRUCK_TRACE_DAY_MAX))){
             endTime = beginTime.plusDays(TRUCK_TRACE_DAY_MAX);
         }