合并分支 'workorder' 到 'master'

Workorder



查看合并请求 !2164

@@ -102,14 +102,13 @@ class FetchTicketProjects extends Command
                         $project->save();
                         $project->save();
                     }
                     }
                 }
                 }
-                echo "V5: {$item['postid']} - {$item['title']} - {$item['company']} - {$item['main_url']}\n";
             }
             }
             $postids = collect($items)->pluck('postid')->toArray();
             $postids = collect($items)->pluck('postid')->toArray();
             // 软删除 gl_ticket_projects 中不存在的项目
             // 软删除 gl_ticket_projects 中不存在的项目
             TicketProject::where('version', 5)
             TicketProject::where('version', 5)
                 ->whereNotIn('post_id', $postids)
                 ->whereNotIn('post_id', $postids)
                 ->update(['is_del' => 1]);
                 ->update(['is_del' => 1]);
-            echo "V5: fetch completed, total " . count($items) . " items\n";
+            echo date("Y-m-d H:i:s") . " V5: fetch completed, total " . count($items) . " items\n";
         }
         }
     }
     }
 
 

 <?php
 <?php
 
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\WorkOrder;
 
 
+use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\WorkOrderLog;
 use App\Models\WorkOrder\WorkOrderLog;
 use App\Services\DingTalkService;
 use App\Services\DingTalkService;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -42,12 +43,12 @@ class WorkOrderDing extends Command
     {
     {
         while (true) {
         while (true) {
             try {
             try {
-                $log = WorkOrderLog::where('ding', 0)->first();
+                $log = TicketLog::where('ding', 0)->first();
                 if (!$log) {
                 if (!$log) {
                     sleep(3);
                     sleep(3);
                     continue;
                     continue;
                 }
                 }
-                $mobile = $log->manager->mobile;
+                $mobile = $log->engineer->mobile;
                 $response = Http::withBasicAuth(
                 $response = Http::withBasicAuth(
                     env('DINGDING_BASIC_USER'),
                     env('DINGDING_BASIC_USER'),
                     env('DINGDING_BASIC_PASS')
                     env('DINGDING_BASIC_PASS')