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 | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 4d1fff4..f8e335f 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -760,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);
@@ -1061,7 +1045,7 @@
}
}
DataTableEntity dt = baseDao.listTable(fse.getTableName(), filter.toString(), new Object[]{}, null,
- UnifySQLFunction.ifnull("updated_utc_datetime", "created_utc_datetime" + " DESC"),
+ 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