修改通知去重复

smart-office-manager-ui/admin/src/views/metting/record/drawershow.vue

@@ -162,14 +162,15 @@
             },
 
           beforeSubmit(data) {
-            data.roomName=this.dict.roomId[data.roomId]
+            let subData={...data}
+            subData.roomName=this.dict.roomId[data.roomId]
             const meetDate = moment(data.meetDate, 'yyyy-MM-DD');
             const serviceTimeStart = moment(data.meetTimeStart, 'HH:mm');
             const serviceTimeEnd = moment(data.meetTimeEnd, 'HH:mm');
 
-            data.meetTimeStart =  moment().set({year:meetDate.year(),month:meetDate.month(),day:meetDate.day(),hour: serviceTimeStart.hour(), minute: serviceTimeStart.minute(),second:0}).format('yyyy-MM-DD HH:mm:ss');
-            data.meetTimeEnd = moment().set({year:meetDate.year(),month:meetDate.month(),day:meetDate.day(),hour: serviceTimeEnd.hour(), minute: serviceTimeEnd.minute(),second:0}).format('yyyy-MM-DD HH:mm:ss');
-            return data
+            subData.meetTimeStart =  moment().set({year:meetDate.year(),month:meetDate.month(),day:meetDate.day(),hour: serviceTimeStart.hour(), minute: serviceTimeStart.minute(),second:0}).format('yyyy-MM-DD HH:mm:ss');
+            subData.meetTimeEnd = moment().set({year:meetDate.year(),month:meetDate.month(),day:meetDate.day(),hour: serviceTimeEnd.hour(), minute: serviceTimeEnd.minute(),second:0}).format('yyyy-MM-DD HH:mm:ss');
+            return subData
           },
 
             afterSubmit(data) {

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

@@ -82,8 +82,12 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     Date meetTimeStart1 =  DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeStart(), "yyyy-MM-dd HH:mm")+":00");
                     Date meetTimeEnd1 =  DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeEnd(), "yyyy-MM-dd HH:mm")+":00");
                     // DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
-                    Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
-                    if (aBoolean) {
+                    //DateRange range2 = DateUtil.range(meetTimeStart1, meetTimeEnd1, DateField.MINUTE);
+                    boolean in = DateUtil.isIn(meetTimeStart, meetTimeStart1, meetTimeEnd1);
+                    boolean in1 = DateUtil.isIn(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
+
+                   // Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
+                    if (in||in1) {
                         bool = true;
                         log.info("meetTimeStart:{},meetTimeEnd:{}, meetTimeStart1:{}, meetTimeEnd1:{}",
                                 DateUtil.date(meetTimeStart).toTimeStr(), DateUtil.date(meetTimeEnd).toTimeStr(),
@@ -93,7 +97,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     }
                 }
                 if (bool) {
-
                     throw new AppException("当前会议室该时段已经存在等待或进行中的会议，请选择其它时间段！");
                 }
             }