KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add audit

Browse Source
This commit is contained in:
hafifierahman
2022-07-27 23:15:54 +08:00
parent 603abad3f9
commit 720e2690c9
1 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+30 -58
View File
@@ -2587,6 +2587,9 @@ class AdminPageController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$year = $request->year;
$month = $request->month;
if($request->jenistebus == 'T') if($request->jenistebus == 'T')
{ {
$bukanansuran_data = TransaksiKeuntungan::on('mysql7') $bukanansuran_data = TransaksiKeuntungan::on('mysql7')
@@ -2596,81 +2599,50 @@ class AdminPageController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
}) })
->where('trans.trans_type','!=','A') ->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year) ->whereMonth('transaksi_keuntungan.tarikh_bayaran','=',$month)
->whereYear('tarikh_bayaran','=',$year)
->where('trans.kodcaw',$request->kodcaw); ->where('trans.kodcaw',$request->kodcaw);
$bukanansuran_get = $bukanansuran_data->get(); $bukanansuran_get = $bukanansuran_data->get();
$bukanansuran_pluck = $bukanansuran_data->pluck('trans.norujukan'); $bukanansuran_pluck = $bukanansuran_data->pluck('trans.norujukan');
$intersection = $bukanansuran_get->intersectByKeys(Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bukanansuran_pluck)->whereNotNull('hargajualan')->get()); $intersection = $bukanansuran_get->intersectByKeys(Gadai::on($cawangan['mysql'])->whereNotNull('hargajualan')->get());
$collectionbukanansurandata = $intersection->toArray(); $collectionbukanansurandata = $intersection->toArray();
dd($intersection->pluck('norujukan'));
return response()->json($collectionbukanansurandata,200); return response()->json($collectionbukanansurandata,200);
}else{ }else if($request->jenistebus == 'A'){
$ansuran_data = TransaksiKeuntungan::on('mysql7') $ansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join) ->leftJoin('transaction as trans', function($join)
{ {
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
}) })
->where('trans.trans_type','=','A') ->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year) ->whereMonth('transaksi_keuntungan.tarikh_bayaran','=',$month)
->where('trans.kodcaw',$request->kodcaw); ->whereYear('tarikh_bayaran','=',$year)
->where('trans.kodcaw',$request->kodcaw);
$ansuran_get = $ansuran_data->get(); $ansuran_get = $ansuran_data->get();
$ansuran_pluck = $ansuran_data->pluck('trans.norujukan'); $ansuran_pluck = $ansuran_data->pluck('trans.norujukan');
$intersectiondiff = $ansuran_get->diffKeys(Gadai::on($cawangan['mysql'])->whereIn('norujukan',$ansuran_pluck)->whereNotNull('hargajualan')->get()); $intersection = $ansuran_get->intersectByKeys(Gadai::on($cawangan['mysql'])->whereNotNull('hargajualan')->get());
$intersection = $ansuran_get->intersectByKeys(Gadai::on($cawangan['mysql'])->whereIn('norujukan',$ansuran_pluck)->whereNotNull('hargajualan')->get());
dd($intersectiondiff->toArray(),$intersection->toArray());
// dd($ansuran_pluck);
$collectionansurandata = $intersection->toArray(); $collectionansurandata = $intersection->toArray();
// $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $ansuran_pluck)->where('hargajualan','<>',null)->pluck('norujukan');
// dd($gadaiData);
dd($intersection->pluck('norujukan'));
// $ansuran_data = TransaksiKeuntungan::on('mysql7')
// // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->leftJoin('transaction as trans', function($join)
// {
// $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
// $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
// })
// ->where('trans.trans_type','=','A')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
// ->whereYear('tarikh_bayaran','=',$current->year)
// ->where('trans.kodcaw',$request->kodcaw)
// // ->whereNotNull('db2.hargajualan')
// // ->sum('bayaran_keuntungan');
// // ->get();
// ->pluck('trans.norujukan');
// $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $ansuran_data)->where('hargajualan','<>',null)->pluck('norujukan');
// // $ansuran = 0;
// // if($ansuran_data){
// // foreach($ansuran_data as $index=>$ansuranData){
// // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
// // if($gadaiData){
// // $ansuran += $ansuranData['bayaran_keuntungan'];
// // }
// // }
// // }
// dd($gadaiData);
return response()->json($collectionansurandata,200); return response()->json($collectionansurandata,200);
}else{
$upahlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>','2013-12-31')
->whereMonth('t_lelong','=',$month)
->whereYear('t_lelong','=',$year)
->get();
return response()->json($upahlelong,200);
} }
} }
} }