update query aa Detail

This commit is contained in:
KhatamNugraha
2024-04-03 10:00:08 +07:00
parent f7a5287f8d
commit f48c5704b8
2 changed files with 11 additions and 6 deletions

View File

@ -112,7 +112,8 @@ class Account extends Model
->where('CUSTOMER', $cust) ->where('CUSTOMER', $cust)
->where('ARR_STATUS','<>', 'CLOSE') ->where('ARR_STATUS','<>', 'CLOSE')
->where('PRODUCT_LINE', 'like', "%" .'DEPOSITS' ."%") ->where('PRODUCT_LINE', 'like', "%" .'DEPOSITS' ."%")
->whereIn(DB::raw("LINKED_APPL_ID"),$acc) // ->whereIn(DB::raw("LINKED_APPL_ID"),$acc)
->where('LINKED_APPL_ID', $acc)
->where('BATCH_DATE', $dataCore) ->where('BATCH_DATE', $dataCore)
->groupBy('LINKED_APPL_ID','CUSTOMER','RENEWAL_DATE','START_DATE','FIXED_RATE','BATCH_DATE','PRODUCT_LINE','ARR_STATUS') ->groupBy('LINKED_APPL_ID','CUSTOMER','RENEWAL_DATE','START_DATE','FIXED_RATE','BATCH_DATE','PRODUCT_LINE','ARR_STATUS')
->limit(100); ->limit(100);

View File

@ -340,8 +340,9 @@
$GetCustomer = $Account->getCustomer($request['cusNo'])->first(); $GetCustomer = $Account->getCustomer($request['cusNo'])->first();
$listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get(); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get();
$dataAADepo = $Account->getAA($request['cusNo'],$arrAccount, $dateCore)->get(); $dataAADepo = $Account->getAA($request['cusNo'],$arrAccount, $dateCore)->get();
// dd( $dataAADepo);
foreach ($listAccount as $key1 => $account) { foreach ($listAccount as $key1 => $account) {
$tenor = ''; $tenor = '';
$DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
$DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE; $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
@ -353,14 +354,15 @@
$DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
$DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL'; $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
if ($account->CATEGORY == '6603') { if ($account->CATEGORY == '6603') {
$dataAADepo = $Account->getAA($request['cusNo'],$account->ACCOUNT_NUMBER, $dateCore)->first();
$tanggal_1 = date_create($dataAADepo[$key1]->RENEWAL_DATE); $tanggal_1 = date_create($dataAADepo->RENEWAL_DATE);
// waktu sekarnag // waktu sekarnag
$tanggal_2 = date_create($dataAADepo[$key1]->START_DATE); $tanggal_2 = date_create($dataAADepo->START_DATE);
$tenor = date_diff( $tanggal_1, $tanggal_2 ); $tenor = date_diff( $tanggal_1, $tanggal_2 );
$DataAccounts[$key1]['MATURITY_DATE'] = date('d-m-Y', strtotime($dataAADepo[$key1]->RENEWAL_DATE)) ; $DataAccounts[$key1]['MATURITY_DATE'] = date('d-m-Y', strtotime($dataAADepo->RENEWAL_DATE)) ;
$DataAccounts[$key1]['ARRANGEMENT_ID'] = ''; $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
$DataAccounts[$key1]['FIXED_RATE'] = $dataAADepo[$key1]->FIXED_RATE . ' %'; $DataAccounts[$key1]['FIXED_RATE'] = $dataAADepo->FIXED_RATE . ' %';
$DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . ' BLN'; $DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . ' BLN';
} else { } else {
$DataAccounts[$key1]['MATURITY_DATE'] = '' ; $DataAccounts[$key1]['MATURITY_DATE'] = '' ;
@ -371,6 +373,8 @@
} }
$Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get(); $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCore)->get();
foreach ($Arrangement as $key2 => $pinjaman) { foreach ($Arrangement as $key2 => $pinjaman) {
$balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first(); $balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();