Silent 6 vuotta sitten
vanhempi
commit
d715c13338
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1 1
      app/Http/Controllers/WeChat/ApiController.php
  2. 2 2
      app/Models/Student.php

+ 1 - 1
app/Http/Controllers/WeChat/ApiController.php

xqd
@@ -467,7 +467,7 @@ class ApiController extends Controller
                     ['teacher_id', '=', $teacher->id],
                 ])->orderBy('updated_at', 'desc')->first();
                 $teacher->remark_time = empty($remark_time) ? '' : substr($remark_time->updated_at, 0, 10);
-                $teacher->average_score = $student->getThisWeekAverageScore($teacher);
+                $teacher->average_score = $student->getThisWeekAverageScore($remark);
             } else {
                 $teacher->remark_time = '';
                 $teacher->average_score = 0;

+ 2 - 2
app/Models/Student.php

xqd xqd
@@ -72,7 +72,7 @@ class Student extends Model
         return empty($tmp) ? true : false;
     }
 
-    public function getThisWeekAverageScore(Teacher $teacher)
+    public function getThisWeekAverageScore(Remark $remark)
     {
         $today = Carbon::today();
         $this_week_begin = null;
@@ -83,7 +83,7 @@ class Student extends Model
 
         return RemarkDetail::where([
             ['student_id', '=', $this['id']],
-            ['teacher_id', '=', $teacher['id']],
+            ['remark_id', '=', $remark['id']],
             ['created_at', '>=', $this_week_begin],
         ])->get()->avg('score');
     }