| commit | 727b755cd7f0a011c80d704f2cc39cfed90089b2 | [log] [tgz] |
|---|---|---|
| author | ChristophWeber <christoph.weber@mettenmeier.de> | Fri Mar 01 09:44:59 2019 +0100 |
| committer | ChristophWeber <christoph.weber@mettenmeier.de> | Fri Mar 01 09:44:59 2019 +0100 |
| tree | 7a20e56d7f16ffa0d71446884b9c731ff7dc924c | |
| parent | bac4c95ffafc19bd1b997715aedfde20234256f0 [diff] |
BP-813 fix wrongly found holiday
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java index 34e987d..79cad33 100644 --- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java +++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
@@ -827,9 +827,10 @@ * @return */ public Boolean isHoliday(Date date, StandbyGroup group) { - + DateTime endTime = new DateTime(DateHelper.getEndOfDay(date)); + endTime = endTime.minus(100); List<CalendarDay> lsCalendarDays = calendarRepository.findValidByDate(DateHelper.getStartOfDay(date), - DateHelper.getEndOfDay(date)); + endTime.toDate()); if (lsCalendarDays != null && !lsCalendarDays.isEmpty()) { List<CalendarDay> lsIgnoreList = group.getLsIgnoredCalendarDays(); for (CalendarDay day : lsCalendarDays) {