From a0d0843edd6f3af2c1c4cb4bf07d5bd59d5609fe Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 16:35:01 +0800
Subject: [PATCH] 会议室功能优化8.22
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..6a9f6bb 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -569,7 +569,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 +612,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 +664,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 +674,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