|
|
@@ -1835,6 +1835,13 @@ public class KwcContractTradeService {
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
logistics = logistics.stream()
|
|
|
+ .peek(log -> {
|
|
|
+ if (Objects.isNull(log.getEndTime())){
|
|
|
+ LocalDate localDate = LocalDate.of(9999, 12, 30);
|
|
|
+ Date date1 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
|
|
|
+ log.setEndTime(date1);
|
|
|
+ }
|
|
|
+ })
|
|
|
.filter(log -> Objects.nonNull(log.getStartTime()) && Objects.nonNull(log.getEndTime()))
|
|
|
.filter(log -> Objects.equals(log.getStatus(), ContractStatusEnum.SIGNED.getCode())
|
|
|
&& log.getStartTime().before(date) && log.getEndTime().after(date))
|