|
@@ -105,7 +105,6 @@ class ZhengshuController extends Controller
|
|
|
}
|
|
|
|
|
|
$day = Carbon::now()->subMonth()->startOfMonth()->toDateString();
|
|
|
- \Illuminate\Support\Facades\Log::error($day.'=='.$group_id.'==');
|
|
|
$month = $model->clone()->where('group_id', $group_id)->where('day', $day)->where('day_type', DayTypeEnum::month)->orderByDesc('id')->select(['id', 'path', 'day'])->first();
|
|
|
if (!$month) {
|
|
|
$month = $model->clone()->where('group_id', 0)->where('day', $day)->where('day_type', DayTypeEnum::month)->orderByDesc('id')->select(['id', 'path', 'day'])->first();
|
|
@@ -122,7 +121,6 @@ class ZhengshuController extends Controller
|
|
|
if (!$year) {
|
|
|
$year = $model->clone()->where('group_id', 0)->where('day', $day)->where('day_type', DayTypeEnum::year)->orderByDesc('id')->select(['id', 'path', 'day'])->first();
|
|
|
}
|
|
|
- \Illuminate\Support\Facades\Log::error($month);
|
|
|
|
|
|
$week = null;
|
|
|
// $month = null;
|