Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
2c0469df
Commit
2c0469df
authored
Oct 22, 2020
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
长期日程bug2
parent
6c8e6e66
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java
+13
-5
No files found.
yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java
View file @
2c0469df
...
...
@@ -124,12 +124,20 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
}
// 检查时间段是否冲突
boolean
isConflict
=
false
;
String
staskTimeFrom
;
String
staskTimeEnd
;
Long
spractitionerId
;
Long
smdDropOptionId
;
for
(
ScheduleTrack
schedule:
showList
)
{
if
(
taskTimeFrom
.
equals
(
schedule
.
getTaskTimeFrom
())
&&
taskTimeEnd
.
equals
(
schedule
.
getTaskTimeEnd
())
&&
trackTime
.
equals
(
CommonUtil
.
dateParseString
(
schedule
.
getTrackTime
(),
"yyyy-MM-dd"
))
&&
practitionerId
.
equals
(
schedule
.
getPractitionerId
())
&&
mdDropOptionId
.
equals
(
schedule
.
getMdDropOptionId
())
staskTimeFrom
=
schedule
.
getTaskTimeFrom
();
staskTimeEnd
=
schedule
.
getTaskTimeEnd
();
spractitionerId
=
schedule
.
getPractitionerId
();
smdDropOptionId
=
schedule
.
getMdDropOptionId
();
if
(
taskTimeFrom
.
equals
(
staskTimeFrom
)
&&
taskTimeEnd
.
equals
(
staskTimeEnd
)
&&
practitionerId
.
equals
(
spractitionerId
)
&&
mdDropOptionId
.
equals
(
smdDropOptionId
)
)
{
isConflict
=
true
;
}
...
...
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