treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imdg plannerMap shedulerDate == null значит вместо NPE запланировать на сегодня. TODO перенести эту правку после мёржа с веткой.

Browse source
This commit is contained in:
AKurakin 2023-01-17 10:58:54 +03:00
parent 6032bba359
commit 198daf9e62
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java
View file

@ -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")) { if (x.getTaskStatus().equalsIgnoreCase("ACTV")) {
listOfPlannerAllToday.add(createPlannerAllTodayFromPlanner(x)); listOfPlannerAllToday.add(createPlannerAllTodayFromPlanner(x));
} }