Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
026f3371
Commit
026f3371
authored
Jan 04, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update mail passwd
parent
1d6e99a0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+8
-5
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
026f3371
...
@@ -169,6 +169,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -169,6 +169,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
long
latestScheduledTimeMills
=
simpleDateFormat
.
parse
(
day
+
" "
+
latestScheduledTime
).
getTime
();
long
latestScheduledTimeMills
=
simpleDateFormat
.
parse
(
day
+
" "
+
latestScheduledTime
).
getTime
();
Period
latestScheduledTimeMillsPeriod
=
new
Period
(
latestScheduledTimeMills
,
dayEndTime
);
Period
latestScheduledTimeMillsPeriod
=
new
Period
(
latestScheduledTimeMills
,
dayEndTime
);
periodList
.
add
(
latestScheduledTimeMillsPeriod
);
periodList
.
add
(
latestScheduledTimeMillsPeriod
);
}
else
{
Period
latestScheduledTimeMillsPeriod
=
new
Period
(
workEndTime
,
dayEndTime
);
periodList
.
add
(
latestScheduledTimeMillsPeriod
);
}
}
/*6、上班开始时间之前的时间不可用*/
/*6、上班开始时间之前的时间不可用*/
...
@@ -186,11 +189,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -186,11 +189,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
periodList
.
addAll
(
takeLeavePeriodList
);
periodList
.
addAll
(
takeLeavePeriodList
);
/*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);
periodList
.
add
(
period4
);
//
periodList.add(period4);
}
//
}
if
(
containFreeServe
)
{
if
(
containFreeServe
)
{
Period
today
=
new
Period
(
LocalDateTime
.
of
(
LocalDate
.
now
(),
LocalTime
.
MIN
).
toInstant
(
ZoneOffset
.
of
(
"+8"
)).
toEpochMilli
(),
Period
today
=
new
Period
(
LocalDateTime
.
of
(
LocalDate
.
now
(),
LocalTime
.
MIN
).
toInstant
(
ZoneOffset
.
of
(
"+8"
)).
toEpochMilli
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment