修改通知去重复

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -81,14 +81,22 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 for (MettingRecordEntity mettingRecord : list) {
                     Date meetTimeStart1 = mettingRecord.getMeetTimeStart();
                     Date meetTimeEnd1 = mettingRecord.getMeetTimeEnd();
+
+                    //格式化分钟
+
                     // DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
                     Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
                     if (aBoolean) {
                         bool = true;
+                        log.info("meetTimeStart:{},meetTimeEnd:{}, meetTimeStart1:{}, meetTimeEnd1:{}",
+                                DateUtil.date(meetTimeStart).toTimeStr(), DateUtil.date(meetTimeEnd).toTimeStr(),
+                                DateUtil.date(meetTimeStart1).toTimeStr(), DateUtil.date(meetTimeEnd1).toTimeStr());
+
                         break;
                     }
                 }
                 if (bool) {
+
                     throw new AppException("当前会议室该时段已经存在等待或进行中的会议，请选择其它时间段！");
                 }
             }
@@ -114,6 +122,9 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
      * @return
      */
     public Boolean checkTimesHasOverlap(Date dynaStartTime, Date dynaEndTime, Date fixedStartTime, Date fixedEndTime) {
+
+
+
         return !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
     }