From 6b344d353d99303ecad296f8a69617fd907a8c29 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Mon, 28 Apr 2025 08:24:50 +0700 Subject: [PATCH] Menambahkan Model Teams Users di Controller Laporan Penilai Jaminan pada Module LPJ --- .../LaporanPenilaiJaminanController.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/LaporanPenilaiJaminanController.php b/app/Http/Controllers/LaporanPenilaiJaminanController.php index 1832dd1..b830f4b 100644 --- a/app/Http/Controllers/LaporanPenilaiJaminanController.php +++ b/app/Http/Controllers/LaporanPenilaiJaminanController.php @@ -2,13 +2,14 @@ namespace Modules\Lpj\Http\Controllers; -use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Modules\Lpj\Models\Permohonan; +use Modules\Lpj\Models\TeamsUsers; +use App\Http\Controllers\Controller; +use Maatwebsite\Excel\Facades\Excel; use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Exports\LaporanPenilaiJaminanExport; -use Maatwebsite\Excel\Facades\Excel; class LaporanPenilaiJaminanController extends Controller { @@ -101,13 +102,13 @@ class LaporanPenilaiJaminanController extends Controller $query->where(function ($q) use ($search) { $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%') - ->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%') - ->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%') - ->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%') - ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%') - ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%'); + ->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%') + ->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%'); - if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) { + if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) { $q->whereBetween('tanggal_permohonan', [$paramsSearch->tanggal_awal, $paramsSearch->tanggal_akhir]); } @@ -161,7 +162,7 @@ class LaporanPenilaiJaminanController extends Controller $filteredRecords = $query->count(); // Get data with necessary relationships - $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai'])->get(); + $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan', 'nilaiPlafond', 'penilai'])->get(); // Calculate total pages $pageCount = ceil($totalRecords / $request->get('size', 10));