合并分支 'workorder' 到 'master'

update



查看合并请求 !2391

@@ -218,11 +218,17 @@ class AsideTicketController extends BaseController
                 $ticket->saveEngineers($request->input('engineer_ids'));
 
             // 其他字段有提交数据才修改，比如star plan_end_at
-            $ticket->title = $request->input('title', $ticket->title);
-            $ticket->content = $request->input('content', $ticket->content);
-            $ticket->star = $request->input('star', $ticket->star);
-            $ticket->plan_end_at = $request->input('plan_end_at', $ticket->plan_end_at);
-            $ticket->status = $request->input('status', $ticket->status);
+            if ($request->input('title'))
+                $ticket->title = $request->input('title');
+            if ($request->input('content'))
+                $ticket->content = $request->input('content');
+            if ($request->input('star'))
+                $ticket->star = $request->input('star');
+            if ($request->input('plan_end_at'))
+                $ticket->plan_end_at = $request->input('plan_end_at');
+            if ($request->input('status'))
+                $ticket->status = $request->input('status');
+
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             {
                 // 完成工单，把子任务里面未完成的工单改为完成

@@ -40,6 +40,7 @@ class Tickets extends Base
      * 逻辑说明：
      * 1. 如果当前项目是超迹，要把徐莹和第一负责人加进去，为参与人
      * 2. 若是域途项目，把黄小玉和第一负责人加进去，为参与人
+     * 3. 若是V5V6的项目，则把组长和第一负责人加进去，为参与人
      */
     public function saveEngineers($engineer_ids = [])
     {
@@ -51,6 +52,9 @@ class Tickets extends Base
             $canyu[] = 20; // 徐莹
          elseif ($this->project->project_cate == 4)
              $canyu[] = 85; // 黄小玉
+        else{
+            // todo  待完善
+        }
 
         $all_engineer_ids = array_unique(array_merge($canyu, $engineer_ids));