会议室看板功能优化9.4

18756

2024-09-04 ddefbee3c6a9625162da2533c86fe663463c376e

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

@@ -238,7 +238,7 @@
        }

        StringBuilder bs=new StringBuilder();
        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,DATE_FORMAT(y.start_time, \"%d-%m-%Y %H:%i\")  start_time_format,y.* ");
        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,DATE_FORMAT(y.start_time, \"%d-%m-%Y %H:%i\")  start_time_format,DATE_FORMAT(y.end_time, \"%d-%m-%Y %H:%i\")  end_time_format,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 y.start_time between  ? and ? ");
@@ -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);
@@ -331,6 +331,22 @@
        String meeting_room = fse.getString("meeting_room");
        String meeting_date = fse.getString("meeting_date");
        String meeting_date_end = fse.getString("meeting_date_end");
        String meeting_resource = fse.getString("meeting_resource");
        String replace_meeting_resource="";
        if(!StringUtils.isEmpty(meeting_resource)){

            String[] split = meeting_resource.split(",");
            for (int i = 0; i < split.length; i++) {
                if(i!=split.length-1){
                    replace_meeting_resource=replace_meeting_resource+"T1.meeting_resource like '%"+split[i]+"%' and ";
                }else {
                    replace_meeting_resource=replace_meeting_resource+"T1.meeting_resource like '%"+split[i]+"%'";
                }

            }

        }

        if(!StringUtils.isEmpty(meeting_room)&&!StringUtils.isEmpty(meeting_date)&&!StringUtils.isEmpty(meeting_date_end)){
            List<Object>param=new ArrayList<>();
            param.add(meeting_room);
@@ -353,6 +369,9 @@
            sb.append(" ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )");
            sb.append(" WHERE T1.meeting_room = ? ");
            sb.append(" and T1.start_time between ? and ? ");
            if(!StringUtils.isEmpty(meeting_resource)){
             sb.append(" and ("+replace_meeting_resource+" )");
            }
            sb.append(" ) a");
            sb.append(" LEFT JOIN product_sys_dict t ON a.type = t.dict_value ");
            sb.append(" AND t.dict_name = '会议室资源'");
@@ -433,6 +452,7 @@
            if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
                baseDao.update(fse);
            }else {
                fse.setValue("status","未开始");
                baseDao.add(fse);
            }
            hashMap.put("code","200");