liyinglin 3 years ago
parent 04ca1a4500
commit 6e63b00cab

@ -17,6 +17,7 @@ use App\Models\Project;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Maatwebsite\Excel\Facades\Excel;
use Spatie\Permission\Models\Role;
class OrdersController extends CommonController
{
@ -45,15 +46,21 @@ class OrdersController extends CommonController
$user = auth()->user();
$areaId = AdminAreaLink::where('project_id', $project_id)->where('admin_id', $user->id)->pluck('area_id');
$bedList = Bed::whereIn('area_id',$areaId)->pluck('id');
$bedList = Bed::whereIn('area_id', $areaId)->pluck('id');
// 判断是否护士长
$userId = auth()->id();
$roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
$hushizhang = DB::table('model_has_roles')->where('role_id', $roleId)
->where('model_type', 'App\Admin')->where('model_id', $userId)->count();
if ($request->keyword) {
$this->model = $this->model->where(function ($query) use ($request) {
$query->where("serial", "like", "%" . $request->keyword . "%")
->orWhere("contact", "like", "%" . $request->keyword . "%")
->orWhere("mobile", "like", "%" . $request->keyword . "%");
})->where(function ($query) use ($bedList) {
if ($bedList->isNotEmpty()) {
})->where(function ($query) use ($hushizhang, $bedList) {
if ($hushizhang) {
$query->whereIn('bed_id', $bedList);
}
});
@ -75,7 +82,7 @@ class OrdersController extends CommonController
"customer",
"manager",
"bed" => function ($query) {
$query->with(["room", "building","area"]);
$query->with(["room", "building", "area"]);
}
])
->orderBy("id", "desc");
@ -163,7 +170,7 @@ class OrdersController extends CommonController
$user = auth()->user();
$areaId = AdminAreaLink::where('project_id', $project_id)->where('admin_id', $user->id)->pluck('area_id');
$bedList = Bed::whereIn('area_id',$areaId)->pluck('id');
$bedList = Bed::whereIn('area_id', $areaId)->pluck('id');
$this->model = $this->model->where("project_id", $project_id)->whereNotNull("scored_at");
if (request()->keyword) {
@ -186,7 +193,7 @@ class OrdersController extends CommonController
"customer",
"manager",
"bed" => function ($query) {
$query->with(["room", "building","area"]);
$query->with(["room", "building", "area"]);
}
])
->orderBy("id", "desc")

Loading…
Cancel
Save