Commit 992dff22 authored by 赵啸非's avatar 赵啸非

修改通知去重复

parent 24b159bf
......@@ -151,11 +151,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
@Override
protected void updateBefore(MettingRecordEntity entity, Context context) throws AppException {
super.updateBefore(entity, context);
checkStartAndEndTime(entity);
Boolean bool = checkExistStartMeetTime(entity);
if (bool) {
throw new AppException("当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!");
}
//判断是否是手动结束会议
MettingRecordEntity mettingRecordEntity = this.get(entity.getId());
if (mettingRecordEntity.getMeetStatus() == MeetStatusEnum.进行中.getValue() && entity.getMeetStatus() == MeetStatusEnum.已结束.getValue()) {
......@@ -169,6 +165,12 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
log.info("手动结束会议记录后发送消息:{}", JSON.toJSONString(deviceList));
}
}else{
checkStartAndEndTime(entity);
Boolean bool = checkExistStartMeetTime(entity);
if (bool) {
throw new AppException("当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!");
}
}
}
......
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