|
@@ -403,19 +403,10 @@ public class Base {
|
|
|
CarInsDateDto cidd = new CarInsDateDto();
|
|
CarInsDateDto cidd = new CarInsDateDto();
|
|
|
if (isNowToTodayEnd(startDate)) {
|
|
if (isNowToTodayEnd(startDate)) {
|
|
|
cidd.setForthwith(true);
|
|
cidd.setForthwith(true);
|
|
|
- cidd.setStartDate(startDate);
|
|
|
|
|
-
|
|
|
|
|
- LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
|
|
|
|
|
- sEndDateTime = sEndDateTime.plusYears(1);
|
|
|
|
|
- cidd.setEndDate(DateTimeUtil.format(sEndDateTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
-
|
|
|
|
|
- } else {
|
|
|
|
|
- cidd.setStartDate(startDate);
|
|
|
|
|
- cidd.setEndDate(endDate);
|
|
|
|
|
- LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
|
|
|
|
|
- sEndDateTime = sEndDateTime.plusYears(1).minusSeconds(1);
|
|
|
|
|
- cidd.setEndDate(DateTimeUtil.format(sEndDateTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ cidd.setStartDate(startDate);
|
|
|
|
|
+ cidd.setEndDate(endDate);
|
|
|
return cidd;
|
|
return cidd;
|
|
|
|
|
|
|
|
}
|
|
}
|