master
cody 5 months ago
parent 82ba994ad0
commit 74249ba7f9

@ -817,10 +817,17 @@ class CourseController extends CommonController
}
$startDate = $all['month'] . '-01';
$endDate = date('Y-m-t', strtotime($startDate));
dd($startDate,$endDate);
$list = Calendar::with('course', 'courseContent')->where('date', 'like', $all['month'] . '%')->orderBy('date')->get();
$range = getDates($startDate, $endDate);
$list = [];
foreach ($range as $date) {
// 查询Calendar模型里start_time和end_time在日期内的数据,其中date是年月日start_time和end_time是时分秒
$list[] = [
'date' => $date,
'details' => Calendar::with('course', 'courseContent')->whereDate('start_time', '>=', $date)
->whereDate('end_time', '<=', $date)
->get()
];
}
return $this->success($list);
}

@ -702,3 +702,19 @@ function getVar($text)
}
return '';
}
/**
* 获取两个日期之间的所有日期
*/
function getDates($start, $end)
{
$dt_start = strtotime($start);
$dt_end = strtotime($end);
$temp = [];
while ($dt_start <= $dt_end) {
$re = date('Y-m-d', $dt_start);
$temp[] = $re;
$dt_start = strtotime('+1 day', $dt_start);
}
return $temp; // 返回data型数据
}

Loading…
Cancel
Save