Merged in izzati (pull request #11)

update query marhun permata

app/Http/Controllers/LelongController.php

@@ -1285,9 +1285,11 @@ class LelongController extends Controller
         $lelong_data = Lelong::on($cawangan['mysql'])
         ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->whereNull('upah12')
-        ->Where('lelong.marhun', 'like', '%PMT%')
+        ->where('lelong.marhun', 'like', '%PMT%')
+        ->orWhere('lelong.marhun', 'like', '%batu%')
         ->orderBy('lelong.t_lelong','asc')
         ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
+        ->whereNull('upah12')
         ->get();
         // dd($lelong_data);
         $groupbybatch = $lelong_data->groupBy('batchno');
@@ -1316,18 +1318,22 @@ class LelongController extends Controller
         $lelong_data = Lelong::on($cawangan['mysql'])
         ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
         ->where('batchno',$batchno)
-        ->Where('lelong.marhun', 'like', '%PMT%')
         ->whereNull('upah12')
+        ->where('lelong.marhun', 'like', '%PMT%')
+        ->orWhere('lelong.marhun', 'like', '%batu%')
+        ->orderBy('lelong.t_lelong','asc')
         ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
+        ->where('batchno',$batchno)
+        ->whereNull('upah12')
         ->get();
         // dd($lelong_data);
         $lelong = [];
         foreach($lelong_data as $index=>$lelongData){   
-           
             // dd($lelongData->norujukan);
             $lelmarhun = LelMarhun::on($cawangan['mysql'])
             ->where('norujukan',$lelongData['norujukan'])
-            ->Where('nota', 'like', '%PMT%')
+            ->where('batch_no',$batchno)
+            // ->Where('nota', 'like', '%PMT%')
             ->get();
             // dd($lelmarhun->norujukan);
             array_push($lelong,[
@@ -1353,10 +1359,12 @@ class LelongController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $lelong_data = Lelong::on($cawangan['mysql'])
         ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
-        ->where('lelong.marhun', 'like', '%PMT%')
         ->whereNull('upah12')
+        ->where('lelong.marhun', 'like', '%PMT%')
+        ->orWhere('lelong.marhun', 'like', '%batu%')
+        ->orderBy('lelong.t_lelong','asc')
         ->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
-        ->orderBy('lelong.t_lelong')
+        ->whereNull('upah12')
         ->get();
         // dd($lelong_data);
         $lelong = [];
@@ -1366,7 +1374,9 @@ class LelongController extends Controller
             $lelmarhun = LelMarhun::on($cawangan['mysql'])
             ->where('norujukan',$lelongData['norujukan'])
             ->where('batch_no',$lelongData['batchno'])
-            ->Where('nota', 'like', '%PMT%')
+            // ->where('nota', 'like', '%PMT%')
+            // ->orWhere('nota', 'like', '%batu%')
+            // ->where('batch_no',$lelongData['batchno'])
             ->get();
            
             array_push($lelong,[
@@ -1394,11 +1404,14 @@ class LelongController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $lelong_data = Lelong::on($cawangan['mysql'])
         ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
-        ->where('gadai.marhun', 'like', "%PMT%")
+        ->join('lelmarhun', 'lelmarhun.norujukan', '=', 'lelong.norujukan')
-        ->OrWhere('gadai.marhun', 'like', "%batu%")
         ->whereNotNull('upah12')
+        ->where('lelmarhun.nota', 'like', '%PMT%')
+        ->orWhere('lelmarhun.nota', 'like', '%batu%')
         ->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
         ->orderBy('lelong.t_lelong')
+        ->whereNotNull('upah12')
+        ->distinct()
         ->get();
         // dd($lelong_data);
         $lelong = [];
@@ -1408,6 +1421,11 @@ class LelongController extends Controller
             $lelmarhun = LelMarhun::on($cawangan['mysql'])
             ->where('norujukan',$lelongData['norujukan'])
             ->where('batch_no',$lelongData['batchno'])
+            ->where('nota', 'like', '%PMT%')
+            ->orWhere('nota', 'like', '%batu%')
+            ->where('batch_no',$lelongData['batchno'])
+            ->where('norujukan',$lelongData['norujukan'])
+            ->distinct()
             ->get();
             // dd($lelmarhun->norujukan);
             array_push($lelong,[
@@ -1430,6 +1448,90 @@ class LelongController extends Controller
         return response()->json($lelong);
     }
 
+    public function showAllLelongByCawanganBatchnoT($kodcaw)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $lelong_data = Lelong::on($cawangan['mysql'])
+        ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
+        ->join('lelmarhun', 'lelmarhun.norujukan', '=', 'lelong.norujukan')
+        ->whereNotNull('upah12')
+        ->where('lelmarhun.nota', 'like', '%PMT%')
+        ->orWhere('lelmarhun.nota', 'like', '%batu%')
+        ->orderBy('lelong.t_lelong','asc')
+        ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
+        ->whereNotNull('upah12')
+        ->distinct()
+        ->get();
+        // dd($lelong_data);
+        $groupbybatch = $lelong_data->groupBy('batchno');
+        $lelong = [];
+
+        foreach($groupbybatch as $index=>$lelongData){           
+            $total_pembiayaan = $lelongData->sum('pinjaman');
+            // dd($total_pembiayaan);
+            $total_lelong = $lelongData->count('norujukan');
+            array_push($lelong,[
+                // "upah12"=>  $lelongData->upah12,
+                "t_lelong"=>  $lelongData->groupBy('t_lelong'),
+                "batchno"=>  $index,
+                "total_pembiayaan"=> $total_pembiayaan,
+                "total_lelong"=> $total_lelong,
+                "kodcaw"=> $kodcaw,
+            ]);
+            // dd($lelong);
+        }
+        return response()->json($lelong);
+    }
+
+    public function showAllLelongByCawanganbyBatchnoT($kodcaw,$batchno)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $lelong_data = Lelong::on($cawangan['mysql'])
+        ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
+        ->join('lelmarhun', 'lelmarhun.norujukan', '=', 'lelong.norujukan')
+        ->where('batchno',$batchno)
+        ->whereNotNull('upah12')
+        ->where('lelmarhun.nota', 'like', '%PMT%')
+        ->orWhere('lelmarhun.nota', 'like', '%batu%')
+        ->orderBy('lelong.t_lelong','asc')
+        ->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
+        ->where('batchno',$batchno)
+        ->whereNotNull('upah12')
+        ->distinct()
+        ->get();
+        // dd($lelong_data);
+        $lelong = [];
+        foreach($lelong_data as $index=>$lelongData){   
+            // dd($lelongData->norujukan);
+            $lelmarhun = LelMarhun::on($cawangan['mysql'])
+            ->where('norujukan',$lelongData['norujukan'])
+            ->where('batch_no',$batchno)
+            ->where('nota', 'like', '%PMT%')
+            ->orWhere('nota', 'like', '%batu%')
+            ->where('batch_no',$batchno)
+            ->where('norujukan',$lelongData['norujukan'])
+            ->distinct()
+            ->get();
+            // dd($lelmarhun->norujukan);
+            array_push($lelong,[
+                "upah12"=>  $lelongData->upah12,
+                "norujukan"=>  $lelongData->norujukan,
+                "nokp"=>  $lelongData->nokp,
+                "t_gadai"=>  $lelongData->t_gadai,
+                "t_lelong"=>  $lelongData->t_lelong,
+                "pinjaman"=>  $lelongData->pinjaman,
+                "baki"=>  $lelongData->baki,
+                "listmarhun"=> $lelmarhun,
+                "kodcaw"=> $kodcaw,
+                "kuantiti"=> $lelmarhun->count('norujukan'),
+            ]);
+            // dd($lelong);
+        }
+
+       
+        return response()->json($lelong);
+    }
+
 
    
 

routes/web.php

@@ -785,6 +785,8 @@ $router->group(['prefix'=>'lelong'], function () use ($router){
     $router->get('get/listlelongbybatch/{kodcaw}/{batchno}',['uses'=>'LelongController@showAllLelongByCawanganbyBatchno']);
     $router->get('get/listbatchlelongall/{kodcaw}',['uses'=>'LelongController@showAllLelongByCawanganbyBatchnoall']);
     $router->get('get/listbatchlelongallT/{kodcaw}',['uses'=>'LelongController@showAllLelongByCawanganbyBatchnoallT']);
+    $router->get('get/listbatchlelongT/{kodcaw}',['uses'=>'LelongController@showAllLelongByCawanganBatchnoT']);
+    $router->get('get/listlelongbybatchT/{kodcaw}/{batchno}',['uses'=>'LelongController@showAllLelongByCawanganbyBatchnoT']);
 
 });