合并分支 'workorder' 到 'master'

wechat_switch



查看合并请求 !2392

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

@@ -25,6 +25,7 @@ class AsideTicketUpdateRequest extends FormRequest
     {
     {
         return [
         return [
             'title' => 'nullable|string',
             'title' => 'nullable|string',
+            'subtitle' => 'nullable|string',
             'content' => 'nullable|string',
             'content' => 'nullable|string',
             'files' => 'nullable|array',
             'files' => 'nullable|array',
             'status' => 'nullable|in:0,1,2,3|integer',
             'status' => 'nullable|in:0,1,2,3|integer',
@@ -32,6 +33,7 @@ class AsideTicketUpdateRequest extends FormRequest
             'star' => 'nullable|in:1,2,3|integer',
             'star' => 'nullable|in:1,2,3|integer',
             'plan_end_at' => 'nullable|date',
             'plan_end_at' => 'nullable|date',
             'reply' => 'nullable|string',  // 弃用
             'reply' => 'nullable|string',  // 弃用
+            'wechat_switch' => 'nullable|in:0,1|integer', // 微信通知开关
         ];
         ];
     }
     }
 }
 }