|
...
|
...
|
@@ -100,7 +100,7 @@ class TicketCount extends Command |
|
|
|
->where(function ($query) {
|
|
|
|
$query->where(function ($q) {
|
|
|
|
$q->whereNotNull('end_at')
|
|
|
|
->whereColumn('plan_end_at', '>', 'end_at');
|
|
|
|
->whereColumn('plan_end_at', '<', 'end_at');
|
|
|
|
})->orWhere(function ($q) {
|
|
|
|
$q->whereNull('end_at')
|
|
|
|
->where('plan_end_at', '>', now());
|
|
...
|
...
|
@@ -166,7 +166,7 @@ class TicketCount extends Command |
|
|
|
->where(function ($query) {
|
|
|
|
$query->where(function ($q) {
|
|
|
|
$q->whereNotNull('end_at')
|
|
|
|
->whereColumn('plan_end_at', '>', 'end_at');
|
|
|
|
->whereColumn('plan_end_at', '<', 'end_at');
|
|
|
|
})->orWhere(function ($q) {
|
|
|
|
$q->whereNull('end_at')
|
|
|
|
->where('plan_end_at', '>', now());
|
|
...
|
...
|
@@ -227,7 +227,7 @@ class TicketCount extends Command |
|
|
|
->where(function ($query) {
|
|
|
|
$query->where(function ($q) {
|
|
|
|
$q->whereNotNull('end_at')
|
|
|
|
->whereColumn('plan_end_at', '>', 'end_at');
|
|
|
|
->whereColumn('plan_end_at', '<>>', 'end_at');
|
|
|
|
})->orWhere(function ($q) {
|
|
|
|
$q->whereNull('end_at')
|
|
|
|
->where('plan_end_at', '>', now());
|
...
|
...
|
|
