Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-12 908ce43ff21c2068ef5148b0a417423c8ed9eae5

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java

@@ -1,14 +1,12 @@
package com.doumee.service.business.impl;

import cn.hutool.core.io.unit.DataUnit;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BookingTimeMapper;
import com.doumee.dao.business.RoomTimeMapper;
import com.doumee.dao.business.join.BookingTimeJoinMapper;
import com.doumee.dao.business.join.BookingsJoinMapper;
@@ -16,7 +14,6 @@
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.dao.business.model.Rooms;
import com.doumee.dao.web.request.RoomTimeRequest;
import com.doumee.service.business.RoomTimeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -149,7 +146,7 @@
            RoomTime s = list.get(i);
            s.setIsUse(false);
            s.setIsChoose(false);
            String now = format.format(roomTime.getYudingDate())+" "+s.getStartTime()+":00";
            String now = format.format(roomTime.getYudingDate())+" "+s.getEndTime()+":00";
            try {
                Date com=format1.parse(now);
                if(flag){