Merge remote-tracking branch 'origin/dev_20200908_PEP_Statistics' into dev

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -67,13 +67,13 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
             }
             String taskTimeFrom = schedule.getTaskTimeFrom();
             String taskTimeEnd = schedule.getTaskTimeEnd();
-            Date trackTime = schedule.getTrackTime();
+            String trackTime = CommonUtil.dateParseString(schedule.getTrackTime(), "yyyy-MM-dd");
             Long practitionerId = schedule.getPractitionerId();
             Long mdDropOptionId = schedule.getMdDropOptionId();
             // 判断日程是否重复
             if (!CommonUtil.isNullOrBlank(taskTimeFrom) && !CommonUtil.isNullOrBlank(taskTimeEnd)) {
-                int count = scheduleTrackMapper.checkIsExist(practitionerId, trackTime, mdDropOptionId, taskTimeFrom, taskTimeEnd);
-                if (count > 0) {
+                boolean isConflict = this.checkTimePeriodConflict(trackTime, taskTimeFrom, taskTimeEnd, practitionerId, mdDropOptionId);
+                if (isConflict) {
                     resp.setCommonResult(new CommonResult(false, "该时间段内该类型日程已存在"));
                     return resp;
                 }
@@ -113,6 +113,30 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         return resp;
     }
 
+    private boolean checkTimePeriodConflict(String trackTime, String taskTimeFrom, String taskTimeEnd, Long practitionerId, Long mdDropOptionId) {
+        List<ScheduleTrack> showList = new ArrayList<>();
+        List<ScheduleTrack> dataList = scheduleTrackMapper.queryScheduleTrackList(practitionerId, trackTime);
+        // 获得当天展示的日程列表
+        for (ScheduleTrack schedule: dataList) {
+            if (this.checkFixedDay(trackTime, schedule)) {
+                showList.add(schedule);
+            }
+        }
+        // 检查时间段是否冲突
+        boolean isConflict = false;
+        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())
+            ) {
+                isConflict = true;
+            }
+        }
+        return isConflict;
+    }
+
     private void insertOpportunityRecord(ScheduleTrack schedule) {
         MktLeadsAssignedTrack track = new MktLeadsAssignedTrack();
         BeanUtils.copyProperties(schedule, track, "id");