master
cody 4 months ago
parent 7240c1ece1
commit cea3470364

@ -54,7 +54,7 @@ class CalendarsController extends BaseController
if ($validator->fails()) { if ($validator->fails()) {
return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
} }
$list = Calendar::with('course', 'courseContent')->where('date', 'like', $all['month'] . '%')->orderBy('date')->get(); $list = Calendar::with('course', 'courseContent')->where('start_time', 'like', $all['month'] . '%')->orderBy('date')->get();
return $this->success($list); return $this->success($list);
} }

@ -867,9 +867,8 @@ class CourseController extends CommonController
if (isset($all['type'])) { if (isset($all['type'])) {
$query->where('type', $all['type']); $query->where('type', $all['type']);
} }
}) })->where('start_time', 'like', '%' . $all['month'] . '%')
->orderBy('start_time', 'asc') ->orderBy('start_time', 'asc')
->where('start_time', 'like', '%' . $all['month'] . '%')
->get(); ->get();
// $range = getDates($startDate, $endDate); // $range = getDates($startDate, $endDate);

Loading…
Cancel
Save