From 22d8b68b19e35bdd2086fd047296abe440639f32 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期四, 18 九月 2025 15:52:27 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 14a507e..4d1fff4 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -354,30 +354,28 @@
param.add(meeting_date);
param.add(meeting_date_end);
StringBuilder sb=new StringBuilder();
- 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(").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 (");
- 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("\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(" and ("+replace_meeting_resource+" )");
+ sb.append("\n ").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 = '浼氳瀹よ祫婧�'");
- 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("\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();
@@ -1062,7 +1060,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