From 09a7c021d02ef10d86c9df5e5f395dc336e98d12 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 17:50:01 +0800
Subject: [PATCH] 会议室功能优化8.22-2
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index dbcc4c3..23a19b0 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -227,13 +227,12 @@
}
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(" SELECT DISTINCT g.room_name,g.uuid as meet_room_uuid,y.* ");
+ bs.append(" FROM product_oa_conference_room_config g");
+ 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(" and y.meeting_resource like ? ");
+ bs.append(" where y.meeting_resource like ? ");
}
bs.append(" ORDER BY y.start_time");
DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray());
@@ -569,7 +568,7 @@
List<String> list1=new ArrayList();
List<String> list2=new ArrayList();
for (int j = 0; j < listDate.size(); j++) {
- if(ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("宸茬鍒�")){
+ if((ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("宸茬鍒�")) || (ObjectUtil.isNotEmpty(listDate.get(j).get("visit_status"))&&listDate.get(j).get("visit_status").equals("宸茶闂�")) ){
if(!list1.contains(listDate.get(j).get("org_level_name"))){
list1.add(listDate.get(j).get("org_level_name").toString());
HashMap<String,Object> hashMap=new HashMap<>();
@@ -612,9 +611,13 @@
String meeting_uuid= fse.getString("meeting_uuid");
String type = fse.getString("type");
+ String user_ids = fse.getString("user_ids");
+
FieldSetEntity product_oa_conference_apply = baseDao.getFieldSetEntity("product_oa_conference_apply", meeting_uuid, false);
- List<Object> params=new ArrayList<>();
+
+ //姝ゆ柟寮忔槸鏍规嵁鍚庡彴鑷姩缁熻鏈闂汉鍛�
+ /* List<Object> params=new ArrayList<>();
params.add(meeting_uuid);
params.add(meeting_uuid);
@@ -660,7 +663,7 @@
user_ids=user_ids+fieldSetEntity.getString("staff_id")+",";
}
- }
+ }*/
String content="";
if(type.equals("1")){
content="浼氳灏嗗紑濮嬬鍒�,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",璇锋寜鏃剁鍒�";
@@ -670,7 +673,7 @@
SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
int user_id = currentUser.getUser_id();
String send_user=user_id+"";
- String reminder_mode = product_oa_conference_apply.getString("reminder_mode");
+ //String reminder_mode = product_oa_conference_apply.getString("reminder_mode");
/* //鐭俊
if(reminder_mode.equals("0")){
}
--
Gitblit v1.9.2