|
...
|
...
|
@@ -359,6 +359,7 @@ class GeoQuestionRes extends Command |
|
|
|
$project_ids = GeoQuestion::where('status', GeoQuestion::STATUS_OPEN)
|
|
|
|
->where(function ($query){
|
|
|
|
$query->where('next_time', '<=', date('Y-m-d'))
|
|
|
|
->orWhereNull('current_time')
|
|
|
|
->orWhereNull('next_time');
|
|
|
|
})
|
|
|
|
->pluck('project_id')
|
|
...
|
...
|
@@ -370,6 +371,7 @@ class GeoQuestionRes extends Command |
|
|
|
->whereIn('project_id', $project_ids)
|
|
|
|
->where(function ($query){
|
|
|
|
$query->where('current_time', '<>', date('Y-m-d'))
|
|
|
|
->orWhereNull('current_time')
|
|
|
|
->orWhereNull('next_time');
|
|
|
|
})
|
|
|
|
->orderBy('next_time', 'asc')
|
...
|
...
|
|
