会议室功能优化8.22-2

18756

2024-08-22 09a7c021d02ef10d86c9df5e5f395dc336e98d12

 src/main/java/com/product/administration/service/ConferenceManagerService.java

@@ -227,13 +227,12 @@
        }

        StringBuilder bs=new StringBuilder();
        bs.append(" SELECT DISTINCT y.*, g.room_name,g.uuid as meet_room_uuid ");
        bs.append(" FROM product_oa_conference_apply y");
        bs.append(" left JOIN product_oa_conference_room_config g ");
        bs.append(" on y.meeting_room=g.uuid ");
        bs.append(" where DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=?");
        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,y.* ");
        bs.append(" FROM product_oa_conference_room_config g");
        bs.append(" left JOIN  product_oa_conference_apply y ");
        bs.append(" on y.meeting_room=g.uuid and DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=? ");
        if(!StringUtils.isEmpty(meeting_resource)){
            bs.append(" and  y.meeting_resource like ? ");
            bs.append(" where  y.meeting_resource like ? ");
        }
        bs.append(" ORDER BY y.start_time");
        DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());