| xqd
@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api\mini;
|
|
|
use App\Models\InnerDevice;
|
|
|
use App\Models\InnerDeviceNamesModel;
|
|
|
use App\Models\Option;
|
|
|
+use App\Models\Order;
|
|
|
+use App\Models\OrderDevice;
|
|
|
use App\Models\WorkPoint;
|
|
|
use Illuminate\Http\Request;
|
|
|
|
| xqd
@@ -28,6 +30,13 @@ class InnerDeviceController extends BaseController
|
|
|
}
|
|
|
$items = $this->model->with('device_name', 'spec', 'project');
|
|
|
$equal_items = ['work_point_id', 'project_id'];
|
|
|
+ $project_id = $request->input('project_id');
|
|
|
+ if(!empty($project_id)){
|
|
|
+ $device_ids = OrderDevice::where('project_id',$project_id)->whereHas('order',function ($query){
|
|
|
+ $query->where('status','=',2)->where('level','=',2)->where('last_project_role_id',5);
|
|
|
+ })->pluck('inner_device_id')->toArray();
|
|
|
+ $items = $items->whereIn('id',$device_ids);
|
|
|
+ }
|
|
|
foreach ($equal_items as $equal_item) {
|
|
|
if($request->input($equal_item)) {
|
|
|
$items = $items->where($equal_item, '=', $request->input($equal_item));
|
| xqd
@@ -35,7 +44,7 @@ class InnerDeviceController extends BaseController
|
|
|
}
|
|
|
if($request->input('status') == 'using') {
|
|
|
$using_id = Option::get('inner_devices', 'status', 'using');
|
|
|
- $items->where('status', $using_id);
|
|
|
+ $items = $items->where(['status'=>$using_id]);
|
|
|
}
|
|
|
$items = $items->get();
|
|
|
return $this->success(['data' => $items]);
|