From c61727dff2a9e94d8a1400e39d07a6ef40477e1b Mon Sep 17 00:00:00 2001
From: Dai <test@test.com>
Date: Wed, 7 May 2025 10:56:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A9=BA=E9=97=B2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=99=E5=B8=88=E6=97=B6=E5=8C=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/TeacherFreeTime.php                |  4 +---
 app/common/service/TeacherFreeTimeService.php       |  3 +++
 .../app/controller/TeacherFreeTimeController.php    | 13 +++++++++++++
 plugin/admin/app/view/teacher-free-time/index.html  |  6 ++++++
 plugin/admin/app/view/teacher-free-time/update.html |  2 +-
 .../admin/app/view/teacher/free_time_setting.html   |  4 +++-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/common/model/TeacherFreeTime.php b/app/common/model/TeacherFreeTime.php
index 99a1820..b54b12e 100644
--- a/app/common/model/TeacherFreeTime.php
+++ b/app/common/model/TeacherFreeTime.php
@@ -29,9 +29,7 @@ class TeacherFreeTime extends BaseModel
     {
         return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind([
             'teacher_name',
-            'teacher_account' => "account",
-            'time_zone_name',
-            'time_zone_offset'
+            'teacher_account' => "account"
         ]);
     }
 
diff --git a/app/common/service/TeacherFreeTimeService.php b/app/common/service/TeacherFreeTimeService.php
index 72505c6..4963471 100644
--- a/app/common/service/TeacherFreeTimeService.php
+++ b/app/common/service/TeacherFreeTimeService.php
@@ -70,6 +70,9 @@ class TeacherFreeTimeService
                         'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->getTimestamp()),
                         'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
                         'month' => date('Y-m', strtotime($free_date)),
+                        'time_zone_id' => $teacher['time_zone_id'],
+                        'time_zone_name' => $teacher['time_zone_name'],
+                        'time_zone_offset' => $teacher['time_zone_offset'],
                     ];
 
                     //判断是否已经存在
diff --git a/plugin/admin/app/controller/TeacherFreeTimeController.php b/plugin/admin/app/controller/TeacherFreeTimeController.php
index 7079ad1..8cefe48 100644
--- a/plugin/admin/app/controller/TeacherFreeTimeController.php
+++ b/plugin/admin/app/controller/TeacherFreeTimeController.php
@@ -96,12 +96,20 @@ class TeacherFreeTimeController extends Crud
 
             $postData = $request->post();
             try {
+                $teacher = Teacher::where(['id'=> $request->post('teacher_id')])->findOrEmpty();
+                if($teacher->isEmpty()){
+                    throw new Exception('未找到教师信息');
+                }
+
                 $teacher_free_time = \app\common\model\TeacherFreeTime::where([
                     'teacher_id' => $postData['teacher_id'],
                     'date' => $postData['date'],
                     'month' => $postData['month'],
                     'time' => $postData['time'],
                     'en_time' => $postData['en_time'],
+                    'time_zone_id' => $teacher['time_zone_id'],
+                    'time_zone_name' => $teacher['time_zone_name'],
+                    'time_zone_offset' => $teacher['time_zone_offset'],
                 ])
                     ->findOrEmpty();
                 if (!$teacher_free_time->isEmpty()) {
@@ -115,6 +123,8 @@ class TeacherFreeTimeController extends Crud
                 $enFirstDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[0]));
                 $enSecondDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[1]));
 
+
+
                 \app\common\model\TeacherFreeTime::create([
                     'teacher_id' => $request->post('teacher_id'),
                     'date' => $request->post('date'),
@@ -126,6 +136,9 @@ class TeacherFreeTimeController extends Crud
                     'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()),
                     'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->getTimestamp()),
                     'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
+                    'time_zone_id' => $teacher['time_zone_id'],
+                    'time_zone_name' => $teacher['time_zone_name'],
+                    'time_zone_offset' => $teacher['time_zone_offset'],
                 ]);
 
                 return json([
diff --git a/plugin/admin/app/view/teacher-free-time/index.html b/plugin/admin/app/view/teacher-free-time/index.html
index 18fced0..9e063d6 100644
--- a/plugin/admin/app/view/teacher-free-time/index.html
+++ b/plugin/admin/app/view/teacher-free-time/index.html
@@ -170,6 +170,12 @@
 						field: "end_time",
 						hide: true,
 					},{
+                        title: "时区",align: "center",
+                        field: "time_zone_name",
+                    },{
+                        title: "时差",align: "center",
+                        field: "time_zone_offset",
+                    },{
 						title: "课程id",align: "center",
 						field: "subject_id",
 						hide: true,
diff --git a/plugin/admin/app/view/teacher-free-time/update.html b/plugin/admin/app/view/teacher-free-time/update.html
index c015540..ed930d2 100644
--- a/plugin/admin/app/view/teacher-free-time/update.html
+++ b/plugin/admin/app/view/teacher-free-time/update.html
@@ -19,7 +19,7 @@
                 <label class="layui-form-label required">教师</label>
                 <div class="layui-input-block">
                     <input type="hidden" name="id" value="{$teacher_free_time['id']}" class="layui-input">
-                    <select lay-search="" name="teacher_id" required lay-verify="required" lay-filter="selectTeacher">
+                    <select lay-search="" name="teacher_id" required lay-verify="required" lay-filter="selectTeacher" disabled>
                         <option value="">请选择或搜索</option>
                         {foreach $teacher as $item}
                         <option value="{$item['id']}" {if $teacher_free_time['teacher_id'] == $item['id']} selected {/if}>{$item['teacher_name']}</option>
diff --git a/plugin/admin/app/view/teacher/free_time_setting.html b/plugin/admin/app/view/teacher/free_time_setting.html
index 3b079e6..504d8e1 100644
--- a/plugin/admin/app/view/teacher/free_time_setting.html
+++ b/plugin/admin/app/view/teacher/free_time_setting.html
@@ -24,11 +24,12 @@
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label">教师时区</label>
+                <label class="layui-form-label">时区</label>
                 <div class="layui-input-block">
                     <input type="text" name="time_zone_name" value="{$free_time['time_zone_name']}" disabled
                            class="layui-input">
                 </div>
+                <span style="font-size: 12px;margin-left: 110px;color: chocolate;">此时区为教师添加空闲时的时区</span>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">时区时差</label>
@@ -36,6 +37,7 @@
                     <input type="text" name="time_zone_offset" value="{$free_time['time_zone_offset']}" disabled
                            class="layui-input">
                 </div>
+
             </div>
 
             <div class="layui-form-item">