合并分支 'workorder' 到 'master'

完成时间



查看合并请求 !2102

@@ -150,10 +150,10 @@ class WorkOrderController extends BaseController
             if ($request->input('status') !== null)
             {
                 $log->status = $request->input('status');
-                if ($log->status == WorkOrder::STATUS_COMPLETED)
+                if ($log->status >= WorkOrder::STATUS_COMPLETED)
                 {
                     // 我的工单标记为已完成
-                    $log->status = WorkOrderLog::STATUS_COMPLETED;
+                    $log->status = $request->input('status');
                     $log->end_at = now();
                 }
             }
@@ -162,7 +162,15 @@ class WorkOrderController extends BaseController
             $pending = $workOrder->logs()
                 ->where('status', '<', WorkOrderLog::STATUS_COMPLETED)
                 ->count();
-            $workOrder->status = $pending == 0 ? WorkOrderLog::STATUS_COMPLETED : WorkOrderLog::STATUS_PROCESSING;
+            if ($pending)
+            {
+                $workOrder->status = WorkOrder::STATUS_PROCESSING;
+            }else
+            {
+                $workOrder->status = WorkOrder::STATUS_COMPLETED;
+                // 如果所有子任务都完成了，则将工单状态改为已完成
+                $workOrder->end_at = now();
+            }
             $workOrder->save();
             return $log;
         });

@@ -120,8 +120,9 @@ class WorkOrderController extends BaseController
         // 更新工单状态
         $workOrder->status = WorkOrder::STATUS_COMPLETED;
         $workOrder->save();
-        // B端完成工单，将所有子任务标记为完成
-        $workOrder->logs()->update(['status' => WorkOrderLog::STATUS_COMPLETED]);
+        // B端完成工单，将所有未完成的子工单状态改为已完成。并记录完成时间
+        $workOrder->logs()->where('status', '<', WorkOrderLog::STATUS_COMPLETED)
+            ->update(['status' => WorkOrderLog::STATUS_COMPLETED, 'end_at' => now()]);
         $this->response('success', Code::SUCCESS);
     }