From 8bbcb008796d22edcf6e63a329a708acccf78862 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 03 九月 2024 16:39:13 +0800
Subject: [PATCH] 会议室功能优化9.3
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 2328374..00deb2b 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -331,6 +331,22 @@
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);
@@ -353,6 +369,9 @@
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 ? ");
+ if(!StringUtils.isEmpty(meeting_resource)){
+ sb.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 = '浼氳瀹よ祫婧�'");
--
Gitblit v1.9.2