Merge remote-tracking branch 'origin/master'

k94314517

2024-09-10 e8908ae7b0bd235ae1fcd34f260f170dcfa39261

 server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java

@@ -60,7 +60,7 @@
        bookquery.eq(Bookings::getIsdeleted, Constants.ZERO);
        bookquery.eq(Bookings::getStatus, Constants.ZERO);
        bookquery.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
        Integer   todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
        Long  todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
        json.put("todayBookingsNum",todayBookingsNum);

        //今日会议时长（小时）
@@ -83,7 +83,7 @@
        bq2.eq(Bookings::getStatus, Constants.ZERO);
        bq2.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
       // bq2.last("limit 1");
        bq2.select("(select count(u.id) from user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
        bq2.select("(select count(u.id) from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
        List<Bookings> bk2= bookingsJoinMapper.selectJoinList(Bookings.class,bq2);

        Integer bookingUser=0;
@@ -136,7 +136,7 @@
        MPJLambdaWrapper<Rooms> rm1 = new MPJLambdaWrapper<>();
        rm1.eq(Rooms::getIsdeleted, Constants.ZERO);
        rm1.eq(Rooms::getStatus, Constants.ZERO);
        Integer roomNum=  roomsJoinMapper.selectCount(rm1);
        Long roomNum=  roomsJoinMapper.selectCount(rm1);
        json.put("roomNum",roomNum);

        //员工数量