|
@@ -318,8 +318,8 @@ public class kwfTruckTraceService {
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- String taskStartEndTime = DateUtils.format(waybillOrder.getStartTime(), DateUtils.DATE_TIME_PATTERN);
|
|
|
|
|
|
|
+ Date startTime = waybillOrder.getCreateTime();
|
|
|
|
|
+ String taskStartEndTime = DateUtils.format(startTime, DateUtils.DATE_TIME_PATTERN);
|
|
|
kwfTruckTraceReplay.setTaskStartTime(StringUtils.equals(taskStartEndTime, CommonConstants.DATE_TIME) ? StringUtils.EMPTY: taskStartEndTime);
|
|
kwfTruckTraceReplay.setTaskStartTime(StringUtils.equals(taskStartEndTime, CommonConstants.DATE_TIME) ? StringUtils.EMPTY: taskStartEndTime);
|
|
|
|
|
|
|
|
kwfTruckTraceReplay.setWarningCount("");
|
|
kwfTruckTraceReplay.setWarningCount("");
|
|
@@ -327,7 +327,6 @@ public class kwfTruckTraceService {
|
|
|
Integer exceptionCount = exceptionCountMap.getOrDefault(waybillOrder.getWOrderNo(), 0);
|
|
Integer exceptionCount = exceptionCountMap.getOrDefault(waybillOrder.getWOrderNo(), 0);
|
|
|
kwfTruckTraceReplay.setExceptionCount(exceptionCount);
|
|
kwfTruckTraceReplay.setExceptionCount(exceptionCount);
|
|
|
// 计算任务耗时(分钟)
|
|
// 计算任务耗时(分钟)
|
|
|
- Date startTime = waybillOrder.getCreateTime();
|
|
|
|
|
Date endTime = new Date();
|
|
Date endTime = new Date();
|
|
|
if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
|
|
if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
|
|
|
endTime = waybillOrder.getUpdateTime() != null ? waybillOrder.getUpdateTime() : new Date();
|
|
endTime = waybillOrder.getUpdateTime() != null ? waybillOrder.getUpdateTime() : new Date();
|