会议室功能优化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());
@@ -612,9 +611,13 @@

        String meeting_uuid= fse.getString("meeting_uuid");
        String type = fse.getString("type");
        String user_ids = fse.getString("user_ids");

        FieldSetEntity product_oa_conference_apply = baseDao.getFieldSetEntity("product_oa_conference_apply", meeting_uuid, false);

        List<Object> params=new ArrayList<>();

        //此方式是根据后台自动统计未访问人员
       /* List<Object> params=new ArrayList<>();
        params.add(meeting_uuid);
        params.add(meeting_uuid);

@@ -660,7 +663,7 @@
                user_ids=user_ids+fieldSetEntity.getString("staff_id")+",";
            }

        }
        }*/
        String content="";
        if(type.equals("1")){
            content="会议将开始签到,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",请按时签到";
@@ -670,7 +673,7 @@
        SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
        int user_id = currentUser.getUser_id();
        String send_user=user_id+"";
        String reminder_mode = product_oa_conference_apply.getString("reminder_mode");
        //String reminder_mode = product_oa_conference_apply.getString("reminder_mode");
     /*   //短信
        if(reminder_mode.equals("0")){
        }