Commit 18c4e916 by liyanlin

fix

parent 986e1bbe
...@@ -196,6 +196,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -196,6 +196,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
periodList.addAll(takeLeavePeriodList); periodList.addAll(takeLeavePeriodList);
takeLeavePeriodList.stream().filter(x -> x.in(workEndTime)).findAny().ifPresent(a ->{
periodList.add(new Period(workEndTime,dayEndTime));
});
// /*8、10点上班(早班)下班后时间不可用*/ // /*8、10点上班(早班)下班后时间不可用*/
// if (startTime.equals("10:00:00")) { // if (startTime.equals("10:00:00")) {
// Period period4 = new Period(workEndTime, dayEndTime); // Period period4 = new Period(workEndTime, dayEndTime);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment