From 2e8250c824a5ed0a0720c50fc3421257ee45073b Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期二, 12 十一月 2024 11:00:01 +0800
Subject: [PATCH] 预警配置修改
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 5918d81..0474f56 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -238,10 +238,10 @@
}
StringBuilder bs=new StringBuilder();
- bs.append(" SELECT DISTINCT g.room_name,g.uuid as meet_room_uuid,DATE_FORMAT(y.start_time, \"%d-%m-%Y %H:%i\") start_time_format,y.* ");
+ bs.append(" SELECT DISTINCT g.room_name,g.uuid as meet_room_uuid,DATE_FORMAT(y.start_time, \"%d-%m-%Y %H:%i\") start_time_format,DATE_FORMAT(y.end_time, \"%d-%m-%Y %H:%i\") end_time_format,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\") between ? and ? ");
+ bs.append(" on y.meeting_room=g.uuid and y.start_time between ? and ? ");
if(!StringUtils.isEmpty(meeting_resource)){
bs.append(" where ( "+replace_meeting_resource+" )");
}
@@ -254,7 +254,7 @@
FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
//鍒濆鍖栦細璁鐨勪娇鐢ㄧ殑鐘舵��
- String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+meeting_date+"'";
+ String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and start_time between '"+meeting_date+"' and '"+meeting_date_end+"'";
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.getFieldSetEntity(i1);
@@ -316,6 +316,7 @@
HashMap<String,Object> hashMap=new HashMap<>();
hashMap.put("room_name",fieldSetEntity.getValue("room_name").toString());
hashMap.put("uuid",fieldSetEntity.getValue("meet_room_uuid").toString());
+ hashMap.put("start_time","");
list.add(fieldSetEntity.getValue("room_name").toString());
listDate.add(hashMap);
}
@@ -330,13 +331,29 @@
String meeting_room = fse.getString("meeting_room");
String meeting_date = fse.getString("meeting_date");
String meeting_date_end = fse.getString("meeting_date_end");
+ String meeting_resource = fse.getString("meeting_resource");
+ String replace_meeting_resource="";
+ if(!StringUtils.isEmpty(meeting_resource)){
+
+ String[] split = meeting_resource.split(",");
+ for (int i = 0; i < split.length; i++) {
+ if(i!=split.length-1){
+ replace_meeting_resource=replace_meeting_resource+"T1.meeting_resource like '%"+split[i]+"%' and ";
+ }else {
+ replace_meeting_resource=replace_meeting_resource+"T1.meeting_resource like '%"+split[i]+"%'";
+ }
+
+ }
+
+ }
+
if(!StringUtils.isEmpty(meeting_room)&&!StringUtils.isEmpty(meeting_date)&&!StringUtils.isEmpty(meeting_date_end)){
List<Object>param=new ArrayList<>();
param.add(meeting_room);
param.add(meeting_date);
param.add(meeting_date_end);
StringBuilder sb=new StringBuilder();
- sb.append(" SELECT b.uuid,DATE_FORMAT(b.start_time, \"%Y-%m-%d\") start_time,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");
+ sb.append(" SELECT b.uuid,DATE_FORMAT(b.start_time, \"%Y-%m-%d\") start_time,b.start_time start_time1,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");
sb.append(" (select user_name from product_sys_users where user_id=b.record_man) as record_man,");
sb.append(" (select user_name from product_sys_users where user_id=b.record_master) as record_master,");
sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H:%i\"),'~',DATE_FORMAT(b.end_time,\"%H:%i\")) as time_quantum,");
@@ -351,7 +368,10 @@
sb.append(" LEFT JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ) T2");
sb.append(" ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )");
sb.append(" WHERE T1.meeting_room = ? ");
- sb.append(" and DATE_FORMAT(T1.start_time,\"%Y-%m-%d\") between ? and ? ");
+ sb.append(" and T1.start_time between ? and ? ");
+ if(!StringUtils.isEmpty(meeting_resource)){
+ sb.append(" and ("+replace_meeting_resource+" )");
+ }
sb.append(" ) a");
sb.append(" LEFT JOIN product_sys_dict t ON a.type = t.dict_value ");
sb.append(" AND t.dict_name = '浼氳瀹よ祫婧�'");
@@ -363,8 +383,8 @@
for (int i = 0; i < dataTableEntity.getRows(); i++) {
FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
Map<Object, Object> MapValues = fieldSetEntity.getValues();
- if(ObjectUtil.isNotEmpty(MapValues.get("start_time")) || ObjectUtil.isNotEmpty( MapValues.get("end_time"))){
- Object start_time = MapValues.get("start_time");
+ if(ObjectUtil.isNotEmpty(MapValues.get("start_time1")) || ObjectUtil.isNotEmpty( MapValues.get("end_time"))){
+ Object start_time = MapValues.get("start_time1");
Object end_time = MapValues.get("end_time");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String start_time_date = dateFormat.format(start_time);
@@ -432,6 +452,7 @@
if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
baseDao.update(fse);
}else {
+ fse.setValue("status","鏈紑濮�");
baseDao.add(fse);
}
hashMap.put("code","200");
--
Gitblit v1.9.2