From 198daf9e628938ba9b031283660d52b1ea21df20 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 17 Jan 2023 10:58:54 +0300 Subject: [PATCH] =?UTF-8?q?imdg=20plannerMap=20shedulerDate=20=3D=3D=20nul?= =?UTF-8?q?l=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B8=D1=82=20=D0=B2=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20NPE=20=D0=B7=D0=B0=D0=BF=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D0=B5=D0=B3=D0=BE=D0=B4=D0=BD=D1=8F.=20TODO=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D1=82=D0=B8=20=D1=8D=D1=82?= =?UTF-8?q?=D1=83=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=20=D0=BC=D1=91=D1=80=D0=B6=D0=B0=20=D1=81=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BA=D0=BE=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java index 9ad1d2551..8ed0e6696 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java @@ -32,7 +32,9 @@ public class Util { } } - plannerMap.values().stream().filter((x) -> x.getClearingDate().isEqual(currentDate)).forEach((x) -> { + plannerMap.values().stream() + .filter(x -> x.getTaskStatus() != null) + .filter((x) -> x.getClearingDate() == null || x.getClearingDate().isEqual(currentDate)).forEach((x) -> { if (x.getTaskStatus().equalsIgnoreCase("ACTV")) { listOfPlannerAllToday.add(createPlannerAllTodayFromPlanner(x)); }