From 2ea0de84776826ce0a7b37db0bbbc718284c6127 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 02 九月 2024 09:31:46 +0800
Subject: [PATCH] 会议室功能优化9.2
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index e0c6f5b..99d7940 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -220,10 +220,19 @@
String meeting_date= fse.getString("meeting_date");
String meeting_resource = fse.getString("meeting_resource");
param.add(meeting_date);
+ String replace_meeting_resource="";
if(!StringUtils.isEmpty(meeting_resource)){
- String replace_meeting_resource = meeting_resource.replace(",", "%");
- meeting_resource="%"+replace_meeting_resource+"%";
- param.add(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+"y.meeting_resource like '%"+split[i]+"%' and ";
+ }else {
+ replace_meeting_resource=replace_meeting_resource+"y.meeting_resource like '%"+split[i]+"%'";
+ }
+
+ }
+
}
StringBuilder bs=new StringBuilder();
@@ -232,7 +241,7 @@
bs.append(" left JOIN product_oa_conference_apply y ");
bs.append(" on y.meeting_room=g.uuid and DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=? ");
if(!StringUtils.isEmpty(meeting_resource)){
- bs.append(" where y.meeting_resource like ? ");
+ bs.append(" where ( "+replace_meeting_resource+" )");
}
bs.append(" ORDER BY y.start_time");
DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());
@@ -255,7 +264,7 @@
}else {
fieldSetEntity1.setValue("status","浼氳涓�");
}
- baseDao.executeUpdate("update product_oa_conference_apply set status='"+fieldSetEntity1.getString("status")+"' where uuid='"+fieldSetEntity1.getString("uuid")+"'");
+ baseDao.executeUpdate("update product_oa_conference_apply set status='"+fieldSetEntity1.getString("status")+"' where uuid='"+fieldSetEntity1.getString("uuid")+"'");
}
if(ObjectUtil.isNotEmpty(fieldSetEntity.getString("uuid"))){
--
Gitblit v1.9.2