From 1327e12b0f0ccedb4046e37042b00ea28fc824fa Mon Sep 17 00:00:00 2001 From: Dai Date: Thu, 8 Aug 2024 17:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/StudentFeedbackService.php | 3 +++ .../controller/StudentFeedbackController.php | 8 +++---- .../app/view/student-feedback/index.html | 24 +++++++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/common/service/StudentFeedbackService.php b/app/common/service/StudentFeedbackService.php index 97df1eb..a7bb488 100644 --- a/app/common/service/StudentFeedbackService.php +++ b/app/common/service/StudentFeedbackService.php @@ -52,8 +52,11 @@ class StudentFeedbackService 'subject_id' => $teacher_schedule_time->subject_id, 'date' => $teacher_schedule_time->date, 'time' => $teacher_schedule_time->time, + 'en_time' => $teacher_schedule_time->en_time, 'start_time' => $teacher_schedule_time->start_time, 'end_time' => $teacher_schedule_time->end_time, + 'en_start_time' => $teacher_schedule_time->en_start_time, + 'en_end_time' => $teacher_schedule_time->en_end_time, ]); return [ diff --git a/plugin/admin/app/controller/StudentFeedbackController.php b/plugin/admin/app/controller/StudentFeedbackController.php index 5967929..0d2e9eb 100644 --- a/plugin/admin/app/controller/StudentFeedbackController.php +++ b/plugin/admin/app/controller/StudentFeedbackController.php @@ -57,7 +57,7 @@ class StudentFeedbackController extends Crud } if(isset($data['date']) && !empty($data['date'])){ if($data['date'][0] && $data['date'][1]){ - $feedback->whereBetweenTime('create_time',$data['date'][0], $data[1] . ' 23:59:59'); + $feedback->whereBetweenTime('created_at', $data['date'][0] . ' 00:00:00', $data['date'][1] . ' 23:59:59'); } } @@ -68,8 +68,8 @@ class StudentFeedbackController extends Crud $page = $page > 0 ? $page : 1; $total = $feedback->count(); - $list = $feedback->with(['student', 'teacher', 'subject'])->page($page, $limit)->select(); - + $list = $feedback->with(['student', 'teacher', 'subject']) + ->page($page, $limit)->select(); return json([ 'code' => ResponseCode::WEB_API_SUCCESS, @@ -82,7 +82,7 @@ class StudentFeedbackController extends Crud return json([ 'code' => ResponseCode::WEB_API_FAIL, 'data' => [], - 'msg' => 'success' + 'msg' => $e->getMessage() ]); } } diff --git a/plugin/admin/app/view/student-feedback/index.html b/plugin/admin/app/view/student-feedback/index.html index 3fd9af0..c41a3d4 100644 --- a/plugin/admin/app/view/student-feedback/index.html +++ b/plugin/admin/app/view/student-feedback/index.html @@ -27,12 +27,12 @@ -
- -
- -
-
+ + + + + +
@@ -169,11 +169,21 @@ title: "日期",align: "center", field: "date", },{ - title: "时间",align: "center", + title: "本地时间",align: "center", + field: "en_time", + },{ + title: "中国时间",align: "center", field: "time", },{ + title: "课程报告",align: "center", + field: "feedback", + templet: function (d) { + return ''+ d['feedback_file_name'] +''; + } + },{ title: "反馈内容",align: "center", field: "feedback", + hide: true, },{ title: "start_time",align: "center", field: "start_time",