Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

master
songweizong 4 months ago
commit a341d0293f

@ -562,7 +562,7 @@ class StatisticsController extends CommonController
$month = request()->month ?? date("Y-m"); $month = request()->month ?? date("Y-m");
$months = $this->_getMonths(); $months = $this->_getMonths();
// 当月天数 // 当月天数1
$days = date('t', strtotime($month)); $days = date('t', strtotime($month));
$area = Area::withCount('beds')->where('project_id', $project_id)->get(); $area = Area::withCount('beds')->where('project_id', $project_id)->get();
$beds = Bed::whereIn('area_id', $area->pluck('id'))->where('project_id', $project_id)->get(); $beds = Bed::whereIn('area_id', $area->pluck('id'))->where('project_id', $project_id)->get();

Loading…
Cancel
Save