提交

MrShi

2025-05-09 ffa54cddadb29a265869573abb0c1067fcd74b96

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

@@ -1316,21 +1316,24 @@
        for (Rooms rooms:roomList) {
            //查询当前会议室是否存在进行中的会议
            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
                    .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal)
                    .eq(Bookings::getStatus,Constants.ZERO).eq(Bookings::getRoomId,rooms.getId()).isNotNull(Bookings::getStartTimeReal).
                    apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
            )<=Constants.ZERO){
                //根据会议室获取可以开启的会议记录（第一条记录）
                Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
                        .eq(Bookings::getIsdeleted,Constants.ZERO)
                        .eq(Bookings::getStatus,Constants.ZERO)
                        .eq(Bookings::getRoomId,rooms.getId())
                        .apply(" now() > START_TIME and now < END_TIME ")
                        .apply(" now() > START_TIME and now() < END_TIME ")
                        .isNull(Bookings::getStartTimeReal)
                        .orderByAsc(Bookings::getStartTime)
                        .last(" limit 1 ")
                );
                bookings.setStartTimeReal(new Date());
                bookings.setEditDate(new Date());
                bookingsMapper.updateById(bookings);
                if(Objects.nonNull(bookings)){
                    bookings.setStartTimeReal(new Date());
                    bookings.setEditDate(bookings.getStartTimeReal());
                    bookingsMapper.updateById(bookings);
                }
            }
        }
    }
@@ -1466,7 +1469,10 @@
                 .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
                 .eq(Bookings::getStatus, MeetConstants.ZERO)
                 .eq(Rooms::getId, rooms.getId())
                 .apply("to_days(t.start_time) = to_days(now()) and t.end_time > now()")//子查询当天的
                 .apply(" (  " +
                         " to_days(t.start_time) = to_days(now()) " +
                         " and ( t.START_TIME_REAL is not null or ( t.end_time > now()  and  t.START_TIME_REAL is  null ) ) " +
                         " ) ")//子查询当天的
                 .orderByAsc(Bookings::getStartTime);
        Integer minute =getNearStartMinut();
        List<Bookings> meetingList =bookingsMapper.selectJoinList(Bookings.class,queryWrapper);