From fe57f974fcaed76ba623a3ee847cdfc62b60af40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Mon, 9 Mar 2026 14:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_will_task/models/yuthon_will_task.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 9606ce845..bacdefcdf 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -125,7 +125,7 @@ class YuthonWillTask(models.Model):
         for record in will_ids:
             record._compute_task_time()
 
-    @api.depends('start_date', 'task_week', 'request_hour_from', 'task_type', 'room_booking_id', 'room_booking_id.stop_datetime')
+    @api.depends('start_date', 'task_week', 'request_hour_from', 'task_type', 'room_booking_id', 'room_booking_id.start_datetime', 'room_booking_id.stop_datetime')
     def _compute_task_time(self):
         for record in self:
             date_str = ""
@@ -159,13 +159,17 @@ class YuthonWillTask(models.Model):
             }
             from_time = hour_mapping.get(record.request_hour_from, "")
             if date_str and from_time:
-                base_time = f"{date_str} {record.task_week} {from_time}"
-                # 会议类型：拼接会议室预订的结束时间
-                if record.task_type == 'meet' and record.room_booking_id and record.room_booking_id.stop_datetime:
+                # 会议类型：显示完整的开始和结束日期时间
+                if record.task_type == 'meet' and record.room_booking_id and record.room_booking_id.start_datetime and record.room_booking_id.stop_datetime:
+                    # 转换为本地时间（UTC+8）
+                    start_local = record.room_booking_id.start_datetime + timedelta(hours=8)
                     stop_local = record.room_booking_id.stop_datetime + timedelta(hours=8)
-                    stop_str = stop_local.strftime("%H:%M")
-                    record.task_time = f"{base_time}-{stop_str}"
+                    # 格式化为 "YYYY-M-D HH∶MM" 格式
+                    start_str = start_local.strftime("%Y-%m-%d %H∶%M")
+                    stop_str = stop_local.strftime("%Y-%m-%d %H∶%M")
+                    record.task_time = f"{start_str} {stop_str}"
                 else:
+                    base_time = f"{date_str} {record.task_week} {from_time}"
                     record.task_time = base_time
             else:
                 record.task_time = ""