Commit 2c0469df by jianan

长期日程bug2

parent 6c8e6e66
......@@ -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;
}
......
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