From 6bc08acfab10b69dd1c53b12076f2dcd92aae2f4 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 19 八月 2024 17:14:40 +0800
Subject: [PATCH] 会议室功能预约会议增加与修改8.19
---
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java | 5 ++
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 22 +++++++++++
src/main/java/com/product/administration/service/ConferenceManagerService.java | 51 +++++++++++++++++++++++++
3 files changed, 77 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index 5cc438e..b61739f 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
import java.util.List;
/**
@@ -462,4 +463,25 @@
}
+ @PostMapping("/save_or_update_meeting_info/{version}")
+ @ApiVersion(1)
+ public String saveOrUpdateMeetingInfo(HttpServletRequest request){
+
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = null;
+ Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if (bean != null) {
+ RequestParameterEntity reqp = (RequestParameterEntity) bean;
+ fse = reqp.getFormData();
+ }
+ //鍒ゆ柇鍙傛暟鏄惁涓虹┖
+ if (bean == null || fse == null) {
+ return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ HashMap hashMap = conferenceManagerService.saveOrUpdateMeetingInfo(fse);
+ return OK(hashMap);
+
+ }
+
+
}
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 2f438ed..eeca058 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -19,6 +19,8 @@
import com.product.core.websocket.service.WebsocketMesssageServiceThread;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.omg.CORBA.OBJ_ADAPTER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -339,6 +341,55 @@
}
+ @Override
+ @Transactional
+ public HashMap saveOrUpdateMeetingInfo(FieldSetEntity fse) throws BaseException {
+
+ Date start_time_date = fse.getDate("start_time");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String format = dateFormat.format(start_time_date);
+
+
+ String filter=" DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+format.split(" ")[0]+"'";
+
+ DataTableEntity dataTableEntity = baseDao.listTable("product_oa_conference_apply",filter,new Object[]{});
+ boolean flag=true;
+ for (int i = 0; i < dataTableEntity.getRows(); i++) {
+ FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
+ Date start_time = fse.getDate("start_time");
+ Date end_time = fse.getDate("end_time");
+ Date start_time1 =fieldSetEntity.getDate("start_time");
+ Date end_time1 = fieldSetEntity.getDate("end_time");
+ if(start_time1.before(start_time) && end_time1.after(start_time)){
+ flag=false;
+ }
+ if(start_time1.before(end_time) && end_time1.after(end_time)){
+ flag=false;
+ }
+
+ if(start_time1.after(start_time) && end_time1.before(end_time)){
+ flag=false;
+ }
+
+ }
+ HashMap<String,Object> hashMap=new HashMap<>();
+ if(flag==false){
+ hashMap.put("code","200");
+ hashMap.put("msg","姝ゆ椂闂存宸茶鍗犵敤");
+ hashMap.put("status","sucess");
+ }else {
+ if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
+ baseDao.update(fse);
+ }else {
+ baseDao.add(fse);
+ }
+ hashMap.put("code","200");
+ hashMap.put("msg","鎴愬姛");
+ hashMap.put("status","sucess");
+ }
+ return hashMap;
+ }
+
/**
* 浼氳瀹や娇鐢ㄦ儏鍐�
diff --git a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
index ccea6b9..423fcd5 100644
--- a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -4,6 +4,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
+import java.util.HashMap;
import java.util.List;
/**
@@ -34,7 +35,9 @@
List getKbData(FieldSetEntity fse)throws BaseException;
- List getMeetingDetails(FieldSetEntity fse)throws BaseException;
+ List getMeetingDetails(FieldSetEntity fse)throws BaseException;
+
+ HashMap saveOrUpdateMeetingInfo(FieldSetEntity fse)throws BaseException;
}
--
Gitblit v1.9.2