From 9ecb3e5aa030a885acfe42fe119e094eb552965b Mon Sep 17 00:00:00 2001 From: 18756 <1875631620@qq.com> Date: 星期二, 20 八月 2024 16:51:20 +0800 Subject: [PATCH] 会议室功能取消开启8.20-1 --- src/main/java/com/product/administration/service/ConferenceManagerService.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 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 53747f8..2478fad 100644 --- a/src/main/java/com/product/administration/service/ConferenceManagerService.java +++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java @@ -343,6 +343,16 @@ MapValues.put("start_time",start_time_date); MapValues.put("end_time",end_time_date); } + + Date date = new Date(); + //鏄惁鑳藉鍙栨秷 + if(date.before(fieldSetEntity.getDate("start_time"))){ + MapValues.put("isCancel",true); + } + //鏄惁鎵ц寮�鍚姛鑳� + if(date.before(fieldSetEntity.getDate("start_time")) && fieldSetEntity.getString("status").equals("宸插彇娑�")){ + MapValues.put("isStart",true); + } dataList.add(MapValues); } return dataList; @@ -430,6 +440,21 @@ return bitMatrix; } + @Override + public void CancelAndStart(FieldSetEntity fse) throws BaseException { + + String uuid = fse.getString("uuid"); + String filter=" status='"+uuid+"'"; + DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{}); + FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0); + if(fieldSetEntity.getString("status").equals("宸插彇娑�")){ + fieldSetEntity.setValue("status","宸插惎鐢�"); + }else { + fieldSetEntity.setValue("status","宸插彇娑�"); + } + baseDao.update(fieldSetEntity); + + } /** -- Gitblit v1.9.2