修改通知去重复

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

@@ -168,8 +168,8 @@
             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()}).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()}).format('yyyy-MM-DD HH:mm:ss');
+            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
           },
 

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

@@ -30,6 +30,7 @@ import com.mortals.xhx.module.metting.service.MettingRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -122,6 +123,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
      * @return
      */
     public Boolean checkTimesHasOverlap(Date dynaStartTime, Date dynaEndTime, Date fixedStartTime, Date fixedEndTime) {
+
+       // dynaStartTime=DateUtil.date(dynaStartTime).getMinutes();
+
+
         return !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
     }
 
@@ -208,4 +213,13 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
         super.removeAfter(ids, context, result);
     }
+
+    public static void main(String[] args) {
+        Date date = new Date();
+        String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm");
+/*        DateUtil.parse(format).
+
+        DateUtil.date(date).
+        System.out.println(  DateUtil.date(date).minute());*/
+    }
 }
\ No newline at end of file