Silent 7 年之前
父节点
当前提交
806c56a2b1
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      app/Models/StudentCourse.php

+ 5 - 1
app/Models/StudentCourse.php

@@ -78,7 +78,11 @@ class StudentCourse extends Model
             return '';
             return '';
         } else {
         } else {
             $days = $this['duration'];
             $days = $this['duration'];
-            $leave_days = (int)Leave::where('student_id', $this['student_id'])->get()->count('days');
+            $leaves = Leave::where('student_id', $this['student_id'])->get();
+            $leave_days = $days;
+            foreach($leaves as $leave) {
+                $leave_days += (int) $leave->days;
+            }
             $days += $leave_days;
             $days += $leave_days;
             return Carbon::createFromTimestamp(strtotime($apply_date))->addDays($days)->toDateString();
             return Carbon::createFromTimestamp(strtotime($apply_date))->addDays($days)->toDateString();
         }
         }