From babe9c186f77b41bef3721a49262ab1a6ee41529 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 16 八月 2024 17:30:31 +0800
Subject: [PATCH] 会议室看板8.16-3
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 024e4d1..e43912d 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -204,19 +204,24 @@
public List getKbData(FieldSetEntity fse) throws BaseException {
List<Object>param=new ArrayList<>();
- String meeting_date = fse.getValue("meeting_date").toString();
- String meeting_resource = fse.getValue("meeting_resource").toString();
- String replace_meeting_resource = meeting_resource.replace(",", "%");
- meeting_resource="%"+replace_meeting_resource+"%";
+ String meeting_date= fse.getString("meeting_date");
+ String meeting_resource = fse.getString("meeting_resource");
param.add(meeting_date);
- param.add(meeting_resource);
+ if(!StringUtils.isEmpty(meeting_resource)){
+ String replace_meeting_resource = meeting_resource.replace(",", "%");
+ meeting_resource="%"+replace_meeting_resource+"%";
+ param.add(meeting_resource);
+ }
+
StringBuilder bs=new StringBuilder();
bs.append(" SELECT DISTINCT y.*, g.room_name,g.uuid as meet_room_uuid ");
bs.append(" FROM product_oa_conference_apply y");
bs.append(" left JOIN product_oa_conference_room_config g ");
bs.append(" on y.meeting_room=g.uuid ");
bs.append(" where DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=?");
- bs.append(" and y.meeting_resource like ? ");
+ if(!StringUtils.isEmpty(meeting_resource)){
+ bs.append(" and y.meeting_resource like ? ");
+ }
DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());
List<String> list=new ArrayList();
List<HashMap> listDate=new ArrayList<>();
@@ -250,6 +255,13 @@
return listDate;
}
+ @Override
+ public List getMeetingDetails(FieldSetEntity fse) throws BaseException {
+
+
+ return null;
+ }
+
/**
* 浼氳瀹や娇鐢ㄦ儏鍐�
--
Gitblit v1.9.2