18756
2024-09-04 ddefbee3c6a9625162da2533c86fe663463c376e
src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -254,7 +254,7 @@
            FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
            //初始化会议室的使用的状态
            String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+meeting_date+"'";
            String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and start_time between '"+meeting_date+"'  and '"+meeting_date_end+"'";
            DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
            for (int i1 = 0; i1 < product_oa_conference_apply.getRows(); i1++) {
                FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getFieldSetEntity(i1);
@@ -452,6 +452,7 @@
            if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
                baseDao.update(fse);
            }else {
                fse.setValue("status","未开始");
                baseDao.add(fse);
            }
            hashMap.put("code","200");