|
@@ -371,7 +371,7 @@ public class Base {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- private boolean isNowToTodayEnd(String dateTime) {
|
|
|
|
|
|
|
+ public static boolean isNowToTodayEnd(String dateTime) {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
|
|
LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
|
|
|
LocalDateTime startDateTime = DateTimeUtil.parseLocalDateTime(dateTime, DateTimeUtil.DATETIME_PATTERN);
|
|
LocalDateTime startDateTime = DateTimeUtil.parseLocalDateTime(dateTime, DateTimeUtil.DATETIME_PATTERN);
|
|
@@ -380,7 +380,7 @@ public class Base {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- private CarInsDateDto buildInsDate(String startDate,String endDate) {
|
|
|
|
|
|
|
+ public static CarInsDateDto buildInsDate(String startDate,String endDate) {
|
|
|
CarInsDateDto cidd = new CarInsDateDto();
|
|
CarInsDateDto cidd = new CarInsDateDto();
|
|
|
if (isNowToTodayEnd(startDate)) {
|
|
if (isNowToTodayEnd(startDate)) {
|
|
|
cidd.setForthwith(true);
|
|
cidd.setForthwith(true);
|
|
@@ -389,7 +389,7 @@ public class Base {
|
|
|
LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
|
|
LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
|
|
|
sEndDateTime = sEndDateTime.plusYears(1);
|
|
sEndDateTime = sEndDateTime.plusYears(1);
|
|
|
|
|
|
|
|
- cidd.setEndDate(DateTimeUtil.getFirstDayOfYearStr(sEndDateTime));
|
|
|
|
|
|
|
+ cidd.setEndDate(DateTimeUtil.format(sEndDateTime,"yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
|
|
}else{
|
|
}else{
|
|
|
cidd.setStartDate(startDate);
|
|
cidd.setStartDate(startDate);
|