Commit 026f3371 by huluobin

update mail passwd

parent 1d6e99a0
......@@ -169,6 +169,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
long latestScheduledTimeMills = simpleDateFormat.parse(day + " " + latestScheduledTime).getTime();
Period latestScheduledTimeMillsPeriod = new Period(latestScheduledTimeMills, dayEndTime);
periodList.add(latestScheduledTimeMillsPeriod);
} else {
Period latestScheduledTimeMillsPeriod = new Period(workEndTime, dayEndTime);
periodList.add(latestScheduledTimeMillsPeriod);
}
/*6、上班开始时间之前的时间不可用*/
......@@ -186,11 +189,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
periodList.addAll(takeLeavePeriodList);
/*8、10点上班(早班)下班后时间不可用*/
if (startTime.equals("10:00:00")) {
Period period4 = new Period(workEndTime, dayEndTime);
periodList.add(period4);
}
// /*8、10点上班(早班)下班后时间不可用*/
// if (startTime.equals("10:00:00")) {
// Period period4 = new Period(workEndTime, dayEndTime);
// periodList.add(period4);
// }
if (containFreeServe) {
Period today = new Period(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).toInstant(ZoneOffset.of("+8")).toEpochMilli(),
......
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