From 4341d1b6ce63488d95b70dd77a8633a801e6f838 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期二, 30 九月 2025 18:07:03 +0800
Subject: [PATCH] 会议管理代码提交
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index ccae2fc..b2017bc 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -220,6 +220,7 @@
public DataTableEntity getKanBanData(FieldSetEntity fse) {
String queryStartDate = fse.getString("query_start_date");
String queryEndDate = fse.getString("query_end_date");
+ String meeting_resource = fse.getString("meeting_resource");
StringBuilder sbSql = new StringBuilder();
sbSql.append("SELECT \n");
sbSql.append(" A.meeting_room AS meeting_room_uuid, \n");
@@ -237,7 +238,18 @@
sbSql.append("WHERE (end_time >= ? AND start_time <= ?)");
DataTableEntity dtRecord = baseDao.listTable(sbSql.toString(), new Object[] {queryStartDate, queryEndDate + " 23:59:59"});
- DataTableEntity dtRoom = baseDao.listTable(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "");
+ String replace_meeting_resource="";
+ if(!StringUtils.isEmpty(meeting_resource)){
+
+ String[] split = meeting_resource.split(",");
+ for (int i = 0; i < split.length; i++) {
+ replace_meeting_resource += "CONCAT(',', enable_seal, ',') LIKE '%,"+split[i]+",%'";
+ if(i!=split.length-1){
+ replace_meeting_resource += " and ";
+ }
+ }
+ }
+ DataTableEntity dtRoom = baseDao.listTable(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, replace_meeting_resource);
// 鍒濆鍖栦細璁璁板綍
Map<String, FieldSetEntity> roomRecord = new HashMap<>();
@@ -477,33 +489,34 @@
param.add(meeting_start_date);
param.add(meeting_end_date);
StringBuilder sb=new StringBuilder();
- 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,");
- sb.append(" DATE_FORMAT(b.start_time,\"%Y-%m-%d\") as meeting_date,");
- sb.append(" GROUP_CONCAT(b.dict_label SEPARATOR ',') AS meeting_resouces ");
- sb.append(" FROM (");
- sb.append(" SELECT DISTINCT a.uuid,a.start_time,a.end_time,a.meeting_topic,a.record_man,a.record_master,a.status,t.dict_label ");
- sb.append(" FROM (");
- sb.append(" SELECT T1.*, ");
- sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.meeting_resource, ',', T2.digit + 1 ), ',',- 1 ) AS type ");
- sb.append(" FROM product_oa_conference_apply T1 ");
- 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 T1.start_time between ? and ? ");
+ sb.append("\nSELECT 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("\n (select user_name from product_sys_users where user_id=b.record_man) as record_man,");
+ sb.append("\n (select user_name from product_sys_users where user_id=b.record_master) as record_master,");
+ sb.append("\n CONCAT(DATE_FORMAT(b.start_time,\"%H:%i\"),'~',DATE_FORMAT(b.end_time,\"%H:%i\")) as time_quantum,");
+ sb.append("\n DATE_FORMAT(b.start_time,\"%Y-%m-%d\") as meeting_date,");
+ sb.append("\n GROUP_CONCAT(b.dict_label SEPARATOR ',') AS meeting_resouces ");
+ sb.append("\nFROM (");
+ sb.append("\n SELECT DISTINCT a.uuid,a.start_time,a.end_time,a.meeting_topic,a.record_man,a.record_master,a.status,t.dict_label ");
+ sb.append("\n FROM (");
+ sb.append("\n SELECT T1.*, ");
+ sb.append("\n SUBSTRING_INDEX( SUBSTRING_INDEX( T1.meeting_resource, ',', T2.digit + 1 ), ',',- 1 ) AS type ");
+ sb.append("\n FROM product_oa_conference_apply T1 ");
+ sb.append("\n LEFT JOIN (");
+ sb.append("\n SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ");
+ sb.append("\n ) T2");
+ sb.append("\n ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )");
+ sb.append("\n WHERE T1.meeting_room = ? ");
+ sb.append("\n 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 = '浼氳瀹よ祫婧�'");
- sb.append(" )b ");
- sb.append(" group by b.uuid,b.start_time,b.end_time,b.meeting_topic,b.record_man,b.record_master,b.status ");
+ sb.append("\n ) a");
+ sb.append("\n LEFT JOIN product_sys_dict t ON a.type = t.dict_value AND t.dict_name = '浼氳瀹よ祫婧�'");
+ sb.append("\n)b ");
+ sb.append("\ngroup by b.uuid,b.start_time,b.end_time,b.meeting_topic,b.record_man,b.record_master,b.status ");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
- List dataList =new ArrayList();
+ List dataList =new ArrayList();
for (int i = 0; i < dataTableEntity.getRows(); i++) {
FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
Map<Object, Object> MapValues = fieldSetEntity.getValues();
@@ -679,36 +692,36 @@
String meeting_uuid = fse.getString("meeting_uuid");
//type=1灏辨槸绛惧埌鏁版嵁锛宼ype=2灏辨槸璁块棶鏁版嵁
- String type = fse.getString("type");
+ String type = fse.getString("type");
List<Object> params=new ArrayList<>();
params.add(meeting_uuid);
params.add(meeting_uuid);
StringBuilder sb=new StringBuilder();
- sb.append(" SELECT c.* FROM ( ");
- sb.append(" SELECT b.staff_id,b.uuid as meeting_uuid,f.show_name,l.uuid as dept_uuid,l.org_level_name,");
+ sb.append("\nSELECT c.* FROM ( ");
+ sb.append("\n SELECT b.staff_id,b.uuid as meeting_uuid,f.show_name,l.uuid as dept_uuid,l.org_level_name,");
if(type.equals("1")){
sb.append(" n.sign_status");
}else {
sb.append(" n.visit_status");
}
- sb.append(" FROM (" );
- sb.append(" SELECT y.*, ");
- sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id");
- sb.append(" FROM product_oa_conference_apply y, ");
- sb.append(" ( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x ");
- sb.append(" WHERE 1 = 1 ");
- sb.append(" AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )");
- sb.append(" and y.uuid= ? ");
- sb.append(" )b ");
- sb.append(" LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id ");
- sb.append(" LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid ");
+ sb.append("\n FROM (" );
+ sb.append("\n SELECT y.*, ");
+ sb.append("\n SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id");
+ sb.append("\n FROM product_oa_conference_apply y, ");
+ sb.append("\n ( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x ");
+ sb.append("\n WHERE 1 = 1 ");
+ sb.append("\n AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )");
+ sb.append("\n and y.uuid= ? ");
+ sb.append("\n )b ");
+ sb.append("\n LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id ");
+ sb.append("\n LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid ");
if(type.equals("1")){
- sb.append(" LEFT JOIN product_oa_conference_sign n ");
+ sb.append("\n LEFT JOIN product_oa_conference_sign n ");
}else {
- sb.append(" LEFT JOIN product_oa_conference_visit n ");
+ sb.append("\n LEFT JOIN product_oa_conference_visit n ");
}
- sb.append(" on b.staff_id=n.user_id and n.meeting_uuid=? ");
+ sb.append("\n on b.staff_id=n.user_id and n.meeting_uuid=? ");
sb.append(" )c");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),params.toArray());
--
Gitblit v1.9.2