product-server-administration
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
杜洪波
2024-10-09 98b4b54ad1469e253958e7a67814ea9b990732ef 
 src/main/java/com/product/administration/service/ConferenceManagerService.java


@@ -218,21 +218,32 @@




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


        String meeting_date= fse.getString("meeting_date");


        String meeting_date_end= fse.getString("meeting_date_end");


        String meeting_resource = fse.getString("meeting_resource");


        param.add(meeting_date);


        param.add(meeting_date_end);


        String replace_meeting_resource="";


        if(!StringUtils.isEmpty(meeting_resource)){


            String replace_meeting_resource = meeting_resource.replace(",", "%");


            meeting_resource="%"+replace_meeting_resource+"%";


            param.add(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+"y.meeting_resource like '%"+split[i]+"%' and ";


                }else {


                    replace_meeting_resource=replace_meeting_resource+"y.meeting_resource like '%"+split[i]+"%'";


                }




            }




        }




        StringBuilder bs=new StringBuilder();


        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,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 DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=? ");


        bs.append(" on y.meeting_room=g.uuid and y.start_time between  ? and ? ");


        if(!StringUtils.isEmpty(meeting_resource)){


            bs.append(" where  y.meeting_resource like ? ");


            bs.append(" where ( "+replace_meeting_resource+" )");


        }


        bs.append(" ORDER BY y.start_time");


        DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());


@@ -243,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);


@@ -264,10 +275,18 @@


                    HashMap<String,Object> hashMap=new HashMap<>();


                    hashMap.put("room_name",fieldSetEntity.getValue("room_name").toString());


                    hashMap.put("uuid",fieldSetEntity.getValue("meet_room_uuid").toString());


                    Object getStartTime = dataTableEntity.getData().get(0).getValue("start_time");


                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


                    Object getStartTime = null;


                    for (int j = 0; j < dataTableEntity.getRows(); j++) {


                        FieldSetEntity fieldSetEntity1 = dataTableEntity.getFieldSetEntity(j);


                        if(fieldSetEntity1.getString("room_name").equals(hashMap.get("room_name"))){


                            getStartTime = fieldSetEntity1.getValue("start_time");


                            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm");


                    String time = dateFormat.format(getStartTime);


                    hashMap.put("start_time",time);


                            break;


                        }




                    }


                    list.add(fieldSetEntity.getValue("room_name").toString());


                    listDate.add(hashMap);




@@ -297,6 +316,7 @@


                    HashMap<String,Object> hashMap=new HashMap<>();


                    hashMap.put("room_name",fieldSetEntity.getValue("room_name").toString());


                    hashMap.put("uuid",fieldSetEntity.getValue("meet_room_uuid").toString());


                    hashMap.put("start_time","");


                    list.add(fieldSetEntity.getValue("room_name").toString());


                    listDate.add(hashMap);


                }


@@ -310,15 +330,33 @@


    public List getMeetingDetails(FieldSetEntity fse) throws BaseException {


        String meeting_room = fse.getString("meeting_room");


        String meeting_date = fse.getString("meeting_date");


        if(!StringUtils.isEmpty(meeting_room)&&!StringUtils.isEmpty(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);


            param.add(meeting_date);


            param.add(meeting_date_end);


            StringBuilder sb=new StringBuilder();


            sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");


            sb.append(" SELECT b.uuid,DATE_FORMAT(b.start_time, \"%Y-%m-%d\")  start_time,b.start_time start_time1,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");


            sb.append(" (select user_name from product_sys_users where user_id=b.record_man) as record_man,");


            sb.append(" (select user_name from product_sys_users where user_id=b.record_master) as record_master,");


            sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H-%i-%S\"),'~',DATE_FORMAT(b.end_time,\"%H-%i-%S\"))  as time_quantum,");


            sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H:%i\"),'~',DATE_FORMAT(b.end_time,\"%H:%i\"))  as time_quantum,");


            sb.append(" DATE_FORMAT(b.start_time,\"%Y-%m-%d\") as meeting_date,");


            sb.append(" GROUP_CONCAT(b.dict_label   SEPARATOR ',') AS meeting_resouces ");


            sb.append(" FROM (");


@@ -330,7 +368,10 @@


            sb.append(" LEFT JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ) T2");


            sb.append(" ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )");


            sb.append(" WHERE T1.meeting_room = ? ");


            sb.append(" and DATE_FORMAT(T1.start_time,\"%Y-%m-%d\")=? ");


            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 = '会议室资源'");


@@ -342,8 +383,8 @@


            for (int i = 0; i < dataTableEntity.getRows(); i++) {


                FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);


                Map<Object, Object> MapValues = fieldSetEntity.getValues();


                if(ObjectUtil.isNotEmpty(MapValues.get("start_time")) || ObjectUtil.isNotEmpty( MapValues.get("end_time"))){


                    Object start_time = MapValues.get("start_time");


                if(ObjectUtil.isNotEmpty(MapValues.get("start_time1")) || ObjectUtil.isNotEmpty( MapValues.get("end_time"))){


                    Object start_time = MapValues.get("start_time1");


                    Object end_time = MapValues.get("end_time");


                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


                    String start_time_date = dateFormat.format(start_time);


@@ -411,6 +452,7 @@


            if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){


                baseDao.update(fse);


            }else {


                fse.setValue("status","未开始");


                baseDao.add(fse);


            }


            hashMap.put("code","200");


@@ -734,8 +776,8 @@


            sql.append(" b.end_time, ");


        }


        sql.append(" b.flow_flag, ");


        sql.append(" FROM ");


        sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");


        sql.append(" FROM ");


        sql.append(" product_oa_CONFERENCE_room_config a ");


        sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM  ");


        sql.append(" product_oa_conference_apply b WHERE ");