b端修改工单，A端修改工单

@@ -142,29 +142,26 @@ class WorkOrderController extends BaseController
                 }
             }
             if ($request->input('content'))
-            {
-                // 工程师在回复处理结果
                 $log->content = $request->input('content');
             if ($request->input('files'))
                 $log->files = $request->input('files');
-                $log->status = WorkOrderLog::STATUS_COMPLETED;
-                $log->end_at = now();
-                $log->save();
-            }
             if ($request->input('status') !== null)
             {
                 $log->status = $request->input('status');
-                $log->save();
+                if ($log->status == WorkOrder::STATUS_COMPLETED)
+                {
+                    // 我的工单标记为已完成
+                    $log->status = WorkOrderLog::STATUS_COMPLETED;
+                    $log->end_at = now();
+                }
             }
-            // 如果所有的子任务都已完成, 则更新工单主表状态
+            $log->save();
+            // 是否有未完成的子任务
             $pending = $workOrder->logs()
                 ->where('status', '<', WorkOrderLog::STATUS_COMPLETED)
                 ->count();
-            if ($pending == 0)
-            {
-                $workOrder->status = WorkOrderLog::STATUS_COMPLETED;
+            $workOrder->status = $pending == 0 ? WorkOrderLog::STATUS_COMPLETED : WorkOrderLog::STATUS_PROCESSING;
             $workOrder->save();
-            }
             return $log;
         });
         $this->response('success', Code::SUCCESS, $result->toArray());

@@ -118,8 +118,10 @@ class WorkOrderController extends BaseController
             $this->response('无权限更新该工单', 403);
         }
         // 更新工单状态
-        $workOrder->status = $request->input('status');
+        $workOrder->status = WorkOrder::STATUS_COMPLETED;
         $workOrder->save();
+        // B端完成工单，将所有子任务标记为完成
+        $workOrder->logs()->update(['status' => WorkOrderLog::STATUS_COMPLETED]);
         $this->response('success', Code::SUCCESS);
     }