Merged in izzati-hotfix-distict-laporan-lelong (pull request #268)

update sort laporan lelong
2025-02-27 06:05:51 +00:00
parent 022fbd6149 6422524c2e
commit e3bd69a369
1 changed files with 4 additions and 2 deletions
@@ -1807,7 +1807,6 @@ class LelongController extends Controller
        if ($request->has('batchno') && !empty($request->batchno)) {
            $lelong_query->where('lelong.batchno', $request->batchno);
        }
-        // dd($lelong_query);
        // Select required fields
        $lelong_data = $lelong_query->select(
            'lelong.batchno', 'lelong.t_lelong', 'gadai.t_gadai', 'gadai.nokp', 'lelong.pinjaman', 
@@ -1816,8 +1815,11 @@ class LelongController extends Controller
            'pembeli.nama', 'pembeli.nokp AS nokppembeli', 'lelong.tagujrah', 'lelong.ujrah', 
            'lelong.onepercent', 'lelong.teller'
        )
-        ->orderBy('lelong.t_lelong')
        ->distinct()
+        ->orderByRaw("
+        SUBSTRING_INDEX(SUBSTRING_INDEX(lelong.norujukan, '-', 1), 'WCY', -1),
+        CAST(SUBSTRING_INDEX(lelong.norujukan, '-', -1) AS UNSIGNED)
+        ")
        ->get();
        // dd($lelong_data);