代码初始化

k94314517

2024-05-15 13b58d0fc355b6256d165cc2ae6a571ffa8e778d

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

@@ -120,7 +120,7 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class, Exception.class})
    public Integer create(Bookings bookings) {
        LoginUserInfo user = new LoginUserInfo();
        LoginUserInfo user = bookings.getLoginUserInfo();
        user.setId(bookings.getCreator());
        isCreateParamValid(bookings, user);
        bookings.setCreateDate(new Date());
@@ -452,14 +452,11 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);

        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);

        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);

        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.orderByDesc(Bookings::getCreateDate);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);

@@ -467,7 +464,7 @@
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
        queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());

        if (pageWrap.getModel().getStartTime() != null) {
            queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -533,11 +530,10 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
        queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
        queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -782,6 +778,18 @@
        String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
        page.getRecords().forEach(i -> {
            i.setPrefixUrl(path);
            if(i.getMeetingStatus().equals(Constants.ZERO)){
                if(i.getStatus()==Constants.ONE){
                    i.setMeetingStatus(5);
                }else{
                    //开始前5分钟 大于当前时间 则显示即将开始
                    if(DateUtil.afterMinutesDate(i.getStartTime(),-5).getTime()>System.currentTimeMillis()){
                        i.setMeetingStatus(4);
                    }
                }

            }

        });
        return page;
    }
@@ -996,7 +1004,7 @@

        lambdaWrapper.selectAll(Bookings.class)
                        .selectAs(SystemUser::getRealname, Bookings::getRealName)
                        .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
                        .selectAs(Company::getName, Bookings::getDepartmentName)
                        .selectAs(Rooms::getName, Bookings::getRoomName)
                .select("CASE DAYOFWEEK(t.START_TIME)\n" +
                        "\tWHEN 1 THEN \t\"星期日\" \tWHEN 2 THEN \"星期一\"\n" +
@@ -1010,8 +1018,7 @@
              //  .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
                .leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
                .leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
                .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
                .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
                .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
                .eq(Bookings::getStatus, MeetConstants.ZERO)