From 0e730e50ae1adcd416fb929b37f022e595d88d79 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 20 八月 2024 09:58:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 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 2f438ed..3fd11f8 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;
@@ -236,7 +238,7 @@
String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+meeting_date+"'";
DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
for (int i1 = 0; i1 < product_oa_conference_apply.getRows(); i1++) {
- FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getData().get(i);
+ FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getFieldSetEntity(i1);
Date date = new Date();
if(date.before(fieldSetEntity1.getDate("start_time"))){
fieldSetEntity1.setValue("status","鏈紑濮�");
@@ -245,9 +247,8 @@
}else {
fieldSetEntity1.setValue("status","浼氳涓�");
}
-
+ baseDao.executeUpdate("update product_oa_conference_apply set status='"+fieldSetEntity1.getString("status")+"' where uuid='"+fieldSetEntity1.getString("uuid")+"'");
}
- baseDao.update(product_oa_conference_apply);
//鏋勯�犳墍闇�瑕佺殑鏍煎紡
if(!list.contains(fieldSetEntity.getValue("room_name").toString())){
HashMap<String,Object> hashMap=new HashMap<>();
@@ -339,6 +340,56 @@
}
+ @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<>();
+ BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
+ 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;
+ }
+
/**
* 浼氳瀹や娇鐢ㄦ儏鍐�
@@ -372,8 +423,8 @@
sql.append(" b.end_time, ");
}
sql.append(" b.flow_flag, ");
- sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" FROM ");
+ sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" product_oa_CONFERENCE_room_config a ");
sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM ");
sql.append(" product_oa_conference_apply b WHERE ");
--
Gitblit v1.9.2