| commit | f01be1f5733c665506f21e17c0bdd931ff29898a | [log] [tgz] |
|---|---|---|
| author | ChristophWeber <christoph.weber@mettenmeier.de> | Thu Jan 31 17:16:06 2019 +0100 |
| committer | ChristophWeber <christoph.weber@mettenmeier.de> | Thu Jan 31 17:16:06 2019 +0100 |
| tree | 4f8544d8ac904c5bb1f176406bf1576b90ee5338 | |
| parent | 767975bda7f5b3fd783707d52d4ceaaeaceb5c81 [diff] |
BP-760, fix 00:00 time of next day without creating a new entry.
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 117a79b..ce0e871 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
@@ -1261,7 +1261,8 @@ body.setModifiedBy(username); body.setStandbyGroup(tempNewGroup); - if (DateHelper.isSameDate(actionDto.getValidFrom(), actionDto.getValidTo())) { + DateTime dt = new DateTime(actionDto.getValidTo()); + if (DateHelper.isSameDate(actionDto.getValidFrom(), dt.minusSeconds(1).toDate())) { // because of no overlapping day schedule body just // gets new values, no second body is needed. body.setValidFrom(actionDto.getValidFrom());