product-server-administration
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
6c
2025-07-18 07ac3f874dda4318b3ba00b5ea08388a33f43d53 
 src/main/java/com/product/administration/service/ConferenceManagerService.java


@@ -27,6 +27,7 @@


import com.product.core.websocket.service.WebsocketMesssageServiceThread;


import com.product.module.sys.entity.SystemUser;


import com.product.util.BaseUtil;


import com.product.util.UnifySQLFunction;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




@@ -238,7 +239,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,DATE_FORMAT(y.end_time, \"%d-%m-%Y %H:%i\")  end_time_format,y.* ");


        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,").append(UnifySQLFunction.dateFormat("y.start_time", "dd-MM-yyyy HH:mm")).append(" start_time_format,").append(UnifySQLFunction.dateFormat("y.end_time", "dd-MM-yyyy HH:mm")).append("  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 ? ");


@@ -353,12 +354,12 @@


            param.add(meeting_date);


            param.add(meeting_date_end);


            StringBuilder sb=new StringBuilder();


            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 b.uuid,").append(UnifySQLFunction.dateFormat("b.start_time", "yyyy-MM-dd")).append("  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\"),'~',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(" CONCAT(").append(UnifySQLFunction.dateFormat("b.start_time", "HH:mm")).append(",'~',").append(UnifySQLFunction.dateFormat("b.end_time", "HH:mm")).append(") as time_quantum,");


            sb.append(" ").append(UnifySQLFunction.dateFormat("b.start_time", "yyyy-MM-dd")).append(" as meeting_date,");


            sb.append(" ").append(UnifySQLFunction.groupConcat("b.dict_label")).append(" AS meeting_resouces ");


            sb.append(" FROM (");


            sb.append(" SELECT DISTINCT a.uuid,a.start_time,a.end_time,a.meeting_topic,a.record_man,a.record_master,a.status,t.dict_label ");


            sb.append(" FROM (");