From c033a23ae590c175d0e9ea3626453ee3beef1e6e Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 19 八月 2024 14:48:13 +0800
Subject: [PATCH] 会议室功能8.19-1

---
 src/main/java/com/product/administration/service/ConferenceManagerService.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index e3b995a..2f438ed 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -1,5 +1,6 @@
 package com.product.administration.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.product.administration.config.CmnConst;
 import com.product.administration.config.SystemCode;
@@ -293,12 +294,14 @@
             param.add(meeting_room);
             param.add(meeting_date);
             StringBuilder sb=new StringBuilder();
-            sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.record_man,b.record_master,b.status, ");
+            sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status, ");
+            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-%S\"),'~',DATE_FORMAT(b.end_time,\"%H-%i-%S\"))  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.record_man,a.record_master,a.status,t.dict_label ");
+            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 ");
@@ -311,14 +314,23 @@
             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.record_man,b.record_master,b.status ");
+            sb.append(" group 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();
             for (int i = 0; i < dataTableEntity.getRows(); i++) {
                 FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
-                Map<Object, Object> values = fieldSetEntity.getValues();
-                dataList.add(values);
+                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");
+                    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);
+                    String end_time_date = dateFormat.format(end_time);
+                   MapValues.put("start_time",start_time_date);
+                   MapValues.put("end_time",end_time_date);
+                }
+                dataList.add(MapValues);
             }
             return  dataList;
         }else {

--
Gitblit v1.9.2