From 15cb14e5d1fe955df8d1b73c2c6c8ca768a64441 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:48:54 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 109 ++++++++++++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index b461217..f8e335f 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/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,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 ? ");
@@ -254,7 +255,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,33 +332,50 @@
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);
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 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(" 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 (");
- sb.append(" SELECT T1.*, ");
- sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.meeting_resource, ',', T2.digit + 1 ), ',',- 1 ) AS type ");
- sb.append(" FROM product_oa_conference_apply T1 ");
- 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 T1.start_time 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 = '浼氳瀹よ祫婧�'");
- sb.append(" )b ");
- sb.append(" group by b.uuid,b.start_time,b.end_time,b.meeting_topic,b.record_man,b.record_master,b.status ");
+ sb.append("\nSELECT 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("\n (select user_name from product_sys_users where user_id=b.record_man) as record_man,");
+ sb.append("\n (select user_name from product_sys_users where user_id=b.record_master) as record_master,");
+ sb.append("\n CONCAT(").append(UnifySQLFunction.dateFormat("b.start_time", "HH:mm")).append(",'~',").append(UnifySQLFunction.dateFormat("b.end_time", "HH:mm")).append(") as time_quantum,");
+ sb.append("\n ").append(UnifySQLFunction.dateFormat("b.start_time", "yyyy-MM-dd")).append(" as meeting_date,");
+ sb.append("\n ").append(UnifySQLFunction.groupConcat("b.dict_label")).append(" AS meeting_resouces ");
+ sb.append("\nFROM (");
+ sb.append("\n 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("\n FROM (");
+ sb.append("\n SELECT T1.*, ");
+ sb.append("\n ").append(UnifySQLFunction.substringIndexFuntion(UnifySQLFunction.substringIndexFuntion("T1.meeting_resource", ",", "T2.digit + 1"), ",", "-1")).append(" AS type ");
+ sb.append("\n FROM product_oa_conference_apply T1 ");
+ sb.append("\n 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("\n ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )");
+ sb.append("\n WHERE T1.meeting_room = ? AND T1.start_time between ? and ? ");
+ if(!StringUtils.isEmpty(meeting_resource)){
+ sb.append("\n ").append("AND ("+replace_meeting_resource+" )");
+ }
+ sb.append("\n ) a");
+ sb.append("\n LEFT JOIN product_sys_dict t ON a.type = t.dict_value AND t.dict_name = '浼氳瀹よ祫婧�'");
+ sb.append("\n) b ");
+ sb.append("\ngroup by b.uuid,b.start_time,b.end_time,b.meeting_topic,b.record_man,b.record_master,b.status ");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
List dataList =new ArrayList();
@@ -433,6 +451,7 @@
if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
baseDao.update(fse);
}else {
+ fse.setValue("status","鏈紑濮�");
baseDao.add(fse);
}
hashMap.put("code","200");
@@ -741,43 +760,27 @@
String startTime = fse.getString("startTime");
String endTime = fse.getString("endTime");
StringBuilder sql = new StringBuilder();
- sql.append(" SELECT ");
- sql.append(" a.uuid, ");
- sql.append(" b.uuid apply_uuid, ");
- sql.append(" a.room_name, ");
- sql.append(" b.meeting_topic, ");
+ sql.append("\nSELECT ");
+ sql.append("\n a.uuid,b.uuid apply_uuid,a.room_name,b.meeting_topic,b.flow_flag, ");
if (com.product.admin.config.CmnConst.MOBILE_CLIENT_TYPE.equalsIgnoreCase(clientType)) {
//绉诲姩绔�
sql.append(" date_format(b.start_time,'%Y-%m-%d %H:%i:%s') start_time, ");
sql.append(" date_format(b.end_time,'%Y-%m-%d %H:%i:%s') end_time, ");
} else {
-
sql.append(" b.start_time, ");
sql.append(" b.end_time, ");
}
- sql.append(" b.flow_flag, ");
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 ");
- sql.append("start_time>=? and start_time<=? or (end_time>=? and start_time<=?) ");
- sql.append(" and start_time is not null and end_time is not null and flow_flag in (1,2) ) b ");
- sql.append(" ON a.uuid = b.meeting_room ");
- sql.append(" WHERE ");
- sql.append(" a.`status` = 1 ");
- sql.append(" AND org_level_uuid = ? ");
- sql.append(" AND enabled_time <= now( ) ");
- sql.append(" GROUP BY ");
- sql.append(" a.uuid, ");
- sql.append(" b.uuid, ");
- sql.append(" a.room_name, ");
- sql.append(" b.meeting_topic, ");
- sql.append(" b.start_time, ");
- sql.append(" b.end_time, ");
- sql.append(" b.created_by,b.flow_flag ");
- sql.append(" ORDER BY ");
- sql.append(" b.start_time ");
+ sql.append("\nFROM product_oa_conference_room_config a ");
+ sql.append("\nLEFT JOIN ( ");
+ sql.append("\n SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by ");
+ sql.append("\n FROM product_oa_conference_apply b ");
+ sql.append("\n WHERE start_time>=? and start_time<=? or (end_time>=? and start_time<=?) ");
+ sql.append("\n AND start_time is not null and end_time is not null and flow_flag in (1,2) ");
+ sql.append("\n) b ON a.uuid = b.meeting_room ");
+ sql.append("\nWHERE a.status = 1 AND org_level_uuid = ? AND enabled_time <= now( ) ");
+ sql.append("\nGROUP BY a.uuid, b.uuid, a.room_name, b.meeting_topic, b.start_time, b.end_time, b.created_by,b.flow_flag ");
+ sql.append("\nORDER BY b.start_time ");
DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
baseDao.loadPromptData(dt);
@@ -1041,7 +1044,9 @@
filter.append(" ) ");
}
}
- DataTableEntity dt = baseDao.listTable(fse.getTableName(), filter.toString(), new Object[]{}, null, "ifnull(updated_utc_datetime,created_utc_datetime) desc", fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE), false);
+ DataTableEntity dt = baseDao.listTable(fse.getTableName(), filter.toString(), new Object[]{}, null,
+ UnifySQLFunction.ifnull("updated_utc_datetime", "created_utc_datetime") + " DESC",
+ fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE), false);
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2