gx

@@ -11,6 +11,9 @@ namespace App\Console\Commands\Ticket;
 
 
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\Ticket\TicketDailyManageCount;
 use App\Models\Ticket\TicketDailyManageCount;
+use App\Models\WorkOrder\TicketLog;
+use App\Models\WorkOrder\TicketProject;
+use App\Models\WorkOrder\Tickets;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 
 
 class TicketCount extends Command
 class TicketCount extends Command
@@ -49,15 +52,17 @@ class TicketCount extends Command
      */
      */
     public function manage_action(){
     public function manage_action(){
         $manageHrModel = new ManageHr();
         $manageHrModel = new ManageHr();
-        $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>1],'id',['id','name','nickname']);
+        $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','manage_id','name','nickname']);
         $date = date('Y-m-d');
         $date = date('Y-m-d');
         $ticketManageCountModel = new TicketDailyManageCount();
         $ticketManageCountModel = new TicketDailyManageCount();
         foreach ($manageList as $item){
         foreach ($manageList as $item){
+            $ticketLogModel = new TicketLog();
+            $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
             $data = [
             $data = [
                 'date'=>$date,
                 'date'=>$date,
                 'manage_id'=>$item['id'],
                 'manage_id'=>$item['id'],
                 'manage_name'=>$item['name'],
                 'manage_name'=>$item['name'],
-                'ticket_num'=>'',//工单总数量
+                'ticket_num'=>$ticket_num,//工单总数量
                 'average_time'=>'',//平均完成工单时长
                 'average_time'=>'',//平均完成工单时长
                 'fastest_time'=>'',//最快完成工单时间
                 'fastest_time'=>'',//最快完成工单时间
                 'timeout_num'=>'',//超时工单数量
                 'timeout_num'=>'',//超时工单数量

@@ -239,9 +239,9 @@ class AsideTicketController extends BaseController
             {
             {
                 // 完成工单，把子任务里面未完成的工单改为完成
                 // 完成工单，把子任务里面未完成的工单改为完成
                 $ticket->end_at = now();
                 $ticket->end_at = now();
-                $ticket->end_time = diffInHours($ticket->end_at,$ticket->created_at);
+                $ticket->end_time = diffInHours($ticket->created_at,now());
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)
-                    ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now()]);
+                    ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now(),'end_time'=>$ticket->end_time]);
                 // 推动微信通知
                 // 推动微信通知
                 $project = $ticket->project;
                 $project = $ticket->project;
                 if ($project->wechat_switch && !$ticket->close_wechat)
                 if ($project->wechat_switch && !$ticket->close_wechat)

@@ -70,6 +70,7 @@ class AsideTicketLogController extends BaseController
                 {
                 {
                     // 我的工单标记为已完成
                     // 我的工单标记为已完成
                     $log->end_at = now();
                     $log->end_at = now();
+                    $log->end_time = diffInHours($ticket->created_at,now());
                 }
                 }
             }
             }
             if ($request->input('reply') !== null)
             if ($request->input('reply') !== null)
@@ -91,7 +92,7 @@ class AsideTicketLogController extends BaseController
                 {
                 {
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->end_at = now();
                     $ticket->end_at = now();
-                    $ticket->end_time = diffInHours($ticket->end_at,$ticket->created_at);
+                    $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
                     $project = $ticket->project;
                     $project = $ticket->project;
                     if ($project->wechat_switch && !$ticket->close_wechat)
                     if ($project->wechat_switch && !$ticket->close_wechat)
                         $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
                         $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");