合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2668

@@ -100,7 +100,7 @@ class TicketCount extends Command
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where(function ($q) {
                     $query->where(function ($q) {
                         $q->whereNotNull('end_at')
                         $q->whereNotNull('end_at')
-                            ->whereColumn('plan_end_at', '>', 'end_at');
+                            ->whereColumn('plan_end_at', '<', 'end_at');
                     })->orWhere(function ($q) {
                     })->orWhere(function ($q) {
                         $q->whereNull('end_at')
                         $q->whereNull('end_at')
                             ->where('plan_end_at', '>', now());
                             ->where('plan_end_at', '>', now());
@@ -161,12 +161,12 @@ class TicketCount extends Command
             }
             }
             //超期工单数量
             //超期工单数量
             $timeout_num = $ticketLogModel
             $timeout_num = $ticketLogModel
-                ->where('engineer_id', $item['manage_id'])
+                ->whereIn('engineer_id', $manageIdArr)
                 ->where('is_engineer', 1)
                 ->where('is_engineer', 1)
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where(function ($q) {
                     $query->where(function ($q) {
                         $q->whereNotNull('end_at')
                         $q->whereNotNull('end_at')
-                            ->whereColumn('plan_end_at', '>', 'end_at');
+                            ->whereColumn('plan_end_at', '<', 'end_at');
                     })->orWhere(function ($q) {
                     })->orWhere(function ($q) {
                         $q->whereNull('end_at')
                         $q->whereNull('end_at')
                             ->where('plan_end_at', '>', now());
                             ->where('plan_end_at', '>', now());
@@ -227,7 +227,7 @@ class TicketCount extends Command
             ->where(function ($query) {
             ->where(function ($query) {
                 $query->where(function ($q) {
                 $query->where(function ($q) {
                     $q->whereNotNull('end_at')
                     $q->whereNotNull('end_at')
-                        ->whereColumn('plan_end_at', '>', 'end_at');
+                        ->whereColumn('plan_end_at', '<>>', 'end_at');
                 })->orWhere(function ($q) {
                 })->orWhere(function ($q) {
                     $q->whereNull('end_at')
                     $q->whereNull('end_at')
                         ->where('plan_end_at', '>', now());
                         ->where('plan_end_at', '>', now());