Commit 1f14e124 authored by 赵啸非's avatar 赵啸非

修改通知去重复

parent 2936dac6
package com.mortals.xhx.module.metting.service.impl; package com.mortals.xhx.module.metting.service.impl;
import cn.hutool.core.date.DateField; import cn.hutool.core.date.*;
import cn.hutool.core.date.DateRange;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.common.code.MeetStatusEnum; import com.mortals.xhx.common.code.MeetStatusEnum;
...@@ -80,11 +77,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -80,11 +77,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
//校验时间段是否有重合 //校验时间段是否有重合
boolean bool = false; boolean bool = false;
for (MettingRecordEntity mettingRecord : list) { for (MettingRecordEntity mettingRecord : list) {
Date meetTimeStart1 = mettingRecord.getMeetTimeStart();
Date meetTimeEnd1 = mettingRecord.getMeetTimeEnd();
//格式化分钟 //格式化分钟
Date meetTimeStart1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeStart(), "yyyy-MM-dd HH:mm"));
Date meetTimeEnd1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeEnd(), "yyyy-MM-dd HH:mm"));
// DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE); // DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1); Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
if (aBoolean) { if (aBoolean) {
...@@ -215,6 +211,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -215,6 +211,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
} }
public static void main(String[] args) { public static void main(String[] args) {
DateTime meetTimeStart=DateUtil.parseTime("18:00:00");
DateTime meetTimeEnd=DateUtil.parseTime("18:00:00");
DateTime meetTimeStart1=DateUtil.parseTime("18:00:00");
DateTime meetTimeEnd1=DateUtil.parseTime("18:00:00");
/*
!(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
*/
Date date = new Date(); Date date = new Date();
String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm"); String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm");
/* DateUtil.parse(format). /* DateUtil.parse(format).
......
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