Fix su ordinamento per data_scan in dialog di situazione articolo

This commit is contained in:
Giuseppe Scorrano 2023-03-29 16:46:25 +02:00
parent ac4a5b1d34
commit d4e7832f80

View File

@ -119,7 +119,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
availableItems = new ArrayList<>();
availableItems = Stream.of(availableItems)
.filter(x -> UtilityDate.isAfterToday(x.getDataScad()))
.filter(x -> x.getDataScad() == null || UtilityDate.isAfterToday(x.getDataScad()))
.toList();
if(availableItems.isEmpty())
@ -141,7 +141,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
var itemListCommessaNotMatchMatch = Stream.of(itemList)
.filter(dialogInfoSituazioneArticoloAvailableListItem -> !dialogInfoSituazioneArticoloAvailableListItem.isCommessaMatch())
.sortBy(x -> x.getDataScad())
.sortBy(x -> x.getDataScad() == null ? UtilityDate.getNow() : x.getDataScad())
.toList();