Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 1c76361d
authored
Nov 08, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
2 parents
16618b85
44fb0b3f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/common/CapacityUtils.java
project-order/src/main/java/com/dituhui/pea/order/common/CapacityUtils.java
View file @
1c76361
...
...
@@ -125,8 +125,8 @@ public class CapacityUtils {
LocalDateTime
preLast
=
startTime
;
for
(
OccupyInfo
o
:
occupyInfos
)
{
if
(
o
.
getBeginTime
().
isAfter
(
preLast
))
{
long
duraionMiu
=
Duration
.
between
(
startTime
,
o
.
getBeginTime
()).
abs
().
toMinutes
();
leisureTime
.
add
(
new
OccupyInfoDetail
(
startTime
,
o
.
getBeginTime
(),
duraionMiu
));
long
duraionMiu
=
Duration
.
between
(
preLast
,
o
.
getBeginTime
()).
abs
().
toMinutes
();
leisureTime
.
add
(
new
OccupyInfoDetail
(
preLast
,
o
.
getBeginTime
(),
duraionMiu
));
}
preLast
=
o
.
getEndTime
();
}
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment