From 00fa2194d460b9aec12750bd9381099036593fa3 Mon Sep 17 00:00:00 2001 From: 18756 <1875631620@qq.com> Date: 星期一, 02 九月 2024 17:46:55 +0800 Subject: [PATCH] 会议室功能优化9.2 --- src/main/java/com/product/administration/service/ConferenceManagerService.java | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java index 99d7940..5918d81 100644 --- a/src/main/java/com/product/administration/service/ConferenceManagerService.java +++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java @@ -218,8 +218,10 @@ 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)){ @@ -236,10 +238,10 @@ } 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,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 DATE_FORMAT(y.start_time,\"%Y-%m-%d\") between ? and ? "); if(!StringUtils.isEmpty(meeting_resource)){ bs.append(" where ( "+replace_meeting_resource+" )"); } @@ -273,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"); - String time = dateFormat.format(getStartTime); - hashMap.put("start_time",time); + 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); @@ -319,15 +329,17 @@ 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"); + 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.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 ("); @@ -339,7 +351,7 @@ 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 DATE_FORMAT(T1.start_time,\"%Y-%m-%d\") between ? and ? "); sb.append(" ) a"); sb.append(" LEFT JOIN product_sys_dict t ON a.type = t.dict_value "); sb.append(" AND t.dict_name = '浼氳瀹よ祫婧�'"); -- Gitblit v1.9.2