正在显示
1 个修改的文件
包含
8 行增加
和
3 行删除
| @@ -29,12 +29,17 @@ class WorkOrderController extends BaseController | @@ -29,12 +29,17 @@ class WorkOrderController extends BaseController | ||
| 29 | ]) | 29 | ]) |
| 30 | ->where('manage_id', $this->manage['id']) | 30 | ->where('manage_id', $this->manage['id']) |
| 31 | ->when($request->input('project_id'), function ($query) use ($request) { | 31 | ->when($request->input('project_id'), function ($query) use ($request) { |
| 32 | - return $query->where('project_id', $request->input('project_id')); | 32 | + // project_id 查 workOrder |
| 33 | + return $query->whereHas('workOrder', function ($q) use ($request) { | ||
| 34 | + $q->where('project_id', $request->input('project_id')); | ||
| 35 | + }); | ||
| 33 | }) | 36 | }) |
| 34 | ->when($request->input('status'), function ($query) use ($request) { | 37 | ->when($request->input('status'), function ($query) use ($request) { |
| 38 | + // status 查 WorkOrderLog | ||
| 35 | return $query->where('status', $request->input('status')); | 39 | return $query->where('status', $request->input('status')); |
| 36 | }) | 40 | }) |
| 37 | ->when($request->input('search'), function ($query) use ($request) { | 41 | ->when($request->input('search'), function ($query) use ($request) { |
| 42 | + // search 查 workOrder | ||
| 38 | return $query->whereHas('workOrder', function ($q) use ($request) { | 43 | return $query->whereHas('workOrder', function ($q) use ($request) { |
| 39 | $q->where('product', 'like', '%' . $request->input('search') . '%') | 44 | $q->where('product', 'like', '%' . $request->input('search') . '%') |
| 40 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); | 45 | ->orWhere('content', 'like', '%' . $request->input('search') . '%'); |
| @@ -96,13 +101,13 @@ class WorkOrderController extends BaseController | @@ -96,13 +101,13 @@ class WorkOrderController extends BaseController | ||
| 96 | if (!$workOrder) | 101 | if (!$workOrder) |
| 97 | $this->response('工单不存在', Code::USER_MODEL_NOTFOUND_ERROE); | 102 | $this->response('工单不存在', Code::USER_MODEL_NOTFOUND_ERROE); |
| 98 | 103 | ||
| 99 | - // TODO 判断是否有查看工单详情权限,待���加 | 104 | + // TODO 判断是否有查看工单详情权限,待添加 |
| 100 | $this->response('success', Code::SUCCESS, $workOrder->toArray()); | 105 | $this->response('success', Code::SUCCESS, $workOrder->toArray()); |
| 101 | } | 106 | } |
| 102 | 107 | ||
| 103 | /** | 108 | /** |
| 104 | * A端操作工单,工程师操作的是工单日志 | 109 | * A端操作工单,工程师操作的是工单日志 |
| 105 | - * - 工程师:回复工单,自动将拆分给自己的子任务改为完成 | 110 | + * - 工程师:回复工单,自动��拆分给自己的子任务改为完成 |
| 106 | * - 工单第一对接人: | 111 | * - 工单第一对接人: |
| 107 | * - 邀请工程师处理工单 | 112 | * - 邀请工程师处理工单 |
| 108 | * - 修改工单状态 | 113 | * - 修改工单状态 |
-
请 注册 或 登录 后发表评论