[Fix] Fixed PeriodHelper shift for days
This commit is contained in:
parent
ad3a22a170
commit
51c6d74955
|
@ -214,8 +214,9 @@ public class PeriodHelper {
|
||||||
return date;
|
return date;
|
||||||
|
|
||||||
ZonedDateTime result = date.plusWeeks(shiftWeeks);
|
ZonedDateTime result = date.plusWeeks(shiftWeeks);
|
||||||
if (!result.isBefore(end))
|
if (result.isBefore(end))
|
||||||
return date.plusWeeks(shiftWeeks - 1);
|
return result;
|
||||||
|
return date.plusWeeks(shiftWeeks - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// see if we are shifting simply by single days
|
// see if we are shifting simply by single days
|
||||||
|
@ -237,7 +238,10 @@ public class PeriodHelper {
|
||||||
if (shiftDays < 1)
|
if (shiftDays < 1)
|
||||||
return date;
|
return date;
|
||||||
|
|
||||||
return date.plusDays(shiftDays);
|
ZonedDateTime result = date.plusDays(shiftDays);
|
||||||
|
if (result.isBefore(end))
|
||||||
|
return result;
|
||||||
|
return date.plusDays(shiftDays - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!period.isZero())
|
if (!period.isZero())
|
||||||
|
|
Loading…
Reference in New Issue