|
|
|
@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Calendar; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
@ -78,11 +79,16 @@ public class PortTransitCycleServiceImpl extends ServiceImpl<PortTransitCycleMap |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
|
|
|
|
// return list.stream() |
|
|
|
// .filter(item -> item.getObd() != null && item.getTransitDays() != null) |
|
|
|
// .peek(item -> item.setCrd(item.getObd().plusDays(item.getTransitDays()))) |
|
|
|
// .collect(Collectors.toList()); |
|
|
|
list.forEach(item -> { |
|
|
|
if (item.getObd() != null && item.getTransitDays() != null) { |
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
calendar.setTime(item.getObd()); |
|
|
|
calendar.add(Calendar.DAY_OF_MONTH, item.getTransitDays()); |
|
|
|
item.setCrd(calendar.getTime()); |
|
|
|
} |
|
|
|
}); |
|
|
|
return list; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |