Merge branch 'Laporan#TuntutBaki' into 'master'

add jenis tuntutan

See merge request online-sistem1/api_arrahn!175
This commit is contained in:
hafifie rahman
2023-02-04 14:20:21 +00:00
@@ -3515,6 +3515,7 @@ class AdminPageController extends Controller
$sortBy = null; $sortBy = null;
} }
if($request->jenistuntut == 'belumtuntut'){
$batchleltuntutbaki = Lelong::on($cawangan['mysql']) $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki') ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan') ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
@@ -3528,6 +3529,34 @@ class AdminPageController extends Controller
return $query->where('baki','!=','0'); return $query->where('baki','!=','0');
}) })
->get()->toArray(); ->get()->toArray();
}else if($request->jenistuntut == 'sudahtuntut'){
$batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
->whereNotNull('gad.upah12')
->whereNotNull('lelong.hargajual')
->whereNotNull('lelong.trkhtuntut')
->when($sortBy, function ($query) use ($sortBy) {
return $query->where('baki',$sortBy,'0');
}, function ($query) {
return $query->where('baki','!=','0');
})
->get()->toArray();
}else{
$batchleltuntutbaki = Lelong::on($cawangan['mysql'])
->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
->whereNotNull('gad.upah12')
->whereNotNull('lelong.hargajual')
->when($sortBy, function ($query) use ($sortBy) {
return $query->where('baki',$sortBy,'0');
}, function ($query) {
return $query->where('baki','!=','0');
})
->get()->toArray();
}
return response()->json($batchleltuntutbaki); return response()->json($batchleltuntutbaki);
} }