suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取忙闲信息修改

Browse Source
This commit is contained in:
俞扬
2023-06-19 17:04:36 +08:00
parent b5b8d05303
commit a17da035a6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java
View File

@@ -96,9 +96,8 @@ public class FeiShuServiceImpl implements FeiShuService {
long endTimeLong = DateUtil.parse(endStr).getTime(); long endTimeLong = DateUtil.parse(endStr).getTime();
for (UserFreeBusyInfoDTO userFreeBusyInfoDTO : UserFreeBusyInfoList) { for (UserFreeBusyInfoDTO userFreeBusyInfoDTO : UserFreeBusyInfoList) {
//如果查询结果中的开始时间和结束时间在时间段内，则设置为忙碌 //比较两个时间段是否有重叠
if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong) if(!(endTimeLong <= userFreeBusyInfoDTO.getStartTime() || startTimeLong >= userFreeBusyInfoDTO.getEndTime())){
|| (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) {
freeBusyInfo.setFree(false); freeBusyInfo.setFree(false);
break; break;
} }