|
|
@@ -1041,20 +1041,20 @@ public class kwfTruckTraceService {
|
|
|
}
|
|
|
@NotNull
|
|
|
private static Date getEndDate(String date) {
|
|
|
- Date startDate;
|
|
|
+ Date endDate;
|
|
|
if (StringUtils.isBlank(date)) {
|
|
|
- startDate = DateUtils.getEndOfDay(new Date());
|
|
|
+ endDate = DateUtils.getEndOfDay(new Date());
|
|
|
} else {
|
|
|
try {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- startDate = sdf.parse(date);
|
|
|
- startDate = DateUtils.getEndOfDay(startDate);
|
|
|
+ endDate = sdf.parse(date);
|
|
|
+ endDate = DateUtils.getEndOfDay(endDate);
|
|
|
} catch (Exception e) {
|
|
|
log.error("解析开始日期失败", e);
|
|
|
- startDate = DateUtils.getEndOfDay(new Date());
|
|
|
+ endDate = DateUtils.getEndOfDay(new Date());
|
|
|
}
|
|
|
}
|
|
|
- return startDate;
|
|
|
+ return endDate;
|
|
|
}
|
|
|
|
|
|
/**
|