From f48c5704b88272dc3e475ab52a7b978890c7353d Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Wed, 3 Apr 2024 10:00:08 +0700
Subject: [PATCH] update query aa Detail

---
 Entities/Account.php                          |  3 ++-
 Http/Controllers/KonfirmasiBankController.php | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Entities/Account.php b/Entities/Account.php
index cc8ede7..13def68 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -112,7 +112,8 @@ class Account extends Model
             ->where('CUSTOMER', $cust)
             ->where('ARR_STATUS','<>', 'CLOSE')
             ->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)
            ->groupBy('LINKED_APPL_ID','CUSTOMER','RENEWAL_DATE','START_DATE','FIXED_RATE','BATCH_DATE','PRODUCT_LINE','ARR_STATUS')
             ->limit(100);
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index b2bfaa7..70cdeae 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -340,8 +340,9 @@
             $GetCustomer        = $Account->getCustomer($request['cusNo'])->first();
             $listAccount        = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get();
             $dataAADepo = $Account->getAA($request['cusNo'],$arrAccount, $dateCore)->get();
-            // dd( $dataAADepo);
+
             foreach ($listAccount as $key1 => $account) {
+
                    $tenor = '';
                    $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
                    $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
@@ -353,14 +354,15 @@
                    $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
                    $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
                    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
-                   $tanggal_2 = date_create($dataAADepo[$key1]->START_DATE);
+                   $tanggal_2 = date_create($dataAADepo->START_DATE);
                    $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]['FIXED_RATE'] =  $dataAADepo[$key1]->FIXED_RATE . '  %';
+                   $DataAccounts[$key1]['FIXED_RATE'] =  $dataAADepo->FIXED_RATE . '  %';
                    $DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . '    BLN';
                    } else {
                    $DataAccounts[$key1]['MATURITY_DATE'] =  '' ;
@@ -371,6 +373,8 @@
             }
 
 
+
+
             $Arrangement        =  $Account->getPinjaman($request['cusNo'], $dateCore)->get();
             foreach ($Arrangement as $key2 => $pinjaman) {
                 $balance        = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();