From 62301e591f3488c9e10e8b13eb4cf186f5f5788f Mon Sep 17 00:00:00 2001 From: KhatamNugraha Date: Wed, 26 Jun 2024 09:27:10 +0700 Subject: [PATCH] FIX accoun RK --- Entities/Account.php | 118 +----------------- Http/Controllers/KonfirmasiBankController.php | 12 +- 2 files changed, 9 insertions(+), 121 deletions(-) diff --git a/Entities/Account.php b/Entities/Account.php index 827c615..2b395ac 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -102,24 +102,7 @@ class Account extends Model return $data; } - // public function getAccount($cif, $arrAccount, $startDate) - // { - // //$uppercaseKodeCabang = Str::upper($kodecabang); - // $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") - // ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.CURRENCY) AS CURRENCY, AC.SHORT_TITLE,MAX(AC.OPENING_DATE) AS OPENING_DATE, MAX(AC.WORKING_BALANCE) AS WORKING_BALANCE, MAX(AC.CATEGORY) AS CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME') - // ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') - // ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID') - // ->where('CUSTOMER_NO', $cif) - // ->where('LIMIT_REF', null) - // ->where('AC.BATCH_DATE', $startDate) - // ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount) - // ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101']) - // ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF') - // // ->orderBy('BATCH_DATE', 'DESC') - // ->limit(100); - // return $data; - // } public function getAA($cust, $acc, $dataCore) { @@ -145,65 +128,6 @@ class Account extends Model } - // public function getArr($cust, $acc, $dataCore) - - // { - - // //$uppercaseKodeCabang = Str::upper($kodecabang); - // //$dateString = $dataCore->format('d/m/Y'); - // // dd($dateString); - // $timestamp = strtotime($dataCore); - - // // Format the timestamp into a date format - // $date = date("Y", $timestamp); - - // $data = DB::connection("db2")->table("MIS.PRODEV_DEPO") - // ->selectRaw('*') - // ->where('NOMOR_CIF', $cust) - // ->whereYear('BATCH_DATE', $date) - // ->where('NOMOR_REKENING', $acc) - // ->where('STATUS_REKENING', 'like', "%" .'CURRENT' ."%") - // // ->groupBy('ARR.ID', 'ARR.LINKED_APPL_ID', 'ARR.CUSTOMER', 'ARR.PRODUCT_LINE','ARR.BATCH_DATE','AD.MATURITY_DATE','AI.FIXED_RATE','ARR.BATCH_DATE') - // ->orderBy('BATCH_DATE', 'DESC') - // ->limit(1); - // return $data; - // } - - // public function getDepo($cust, $acc, $dataCore) - // { - - // //DD($cust, $acc, $dataCore); - - // $timestamp = strtotime($dataCore); - // // Format the timestamp into a date format - // $date = date("m/d/Y", $timestamp); - // // dd( $date); - // $matYear = date("Y", $timestamp); - - // $data = DB::connection("db2")->table("MIS.FACT_DPK AS DPK") - // ->selectRaw('DPK.NO_REK, - // DPK.SUKU_BUNGA, - // DPK.JUMLAH_NOMINAL, - // DPK.KODE_SUB_PRODUK, - // PER.DATE AS PERIOD, - // MAT.DATE AS JATUH_TEMPO, - // CUR.KODE_MATA_UANG, - // DPK.SK_STATUS_DEPOSITO') - // ->join('MIS.DIM_PERIOD AS PER', 'DPK.SK_PERIOD', '=', 'PER.SK_PERIOD') - // ->join('MIS.DIM_PERIOD AS MAT', 'DPK.SK_JATUH_TEMPO', '=', 'MAT.SK_PERIOD') - // ->join('MIS.DIM_MATA_UANG AS CUR', 'DPK.SK_MATA_UANG', '=', 'CUR.SK_MATA_UANG') - // // ->where('CUSTOMER_NO', $cif) - // // ->where('LIMIT_REF', null) - // ->where('PER.DATE', $date) - // //->whereYear('MAT.DATE', '>', $matYear) - // ->whereIn('DPK.NO_REK', $acc) - // //->whereIn('DPK.NO_REK', '<>',$arrExp) - // // ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF') - // // ->orderBy('CATEGORY', 'ASC') - // ->limit(100); - // return $data; - // } - public function getDepo($cust, $acc, $dataCore){ $timestamp = strtotime($dataCore); $date = date("m/d/Y", $timestamp); @@ -233,27 +157,6 @@ class Account extends Model return $data; } - // public function getAA($cust, $acc, $dataCore) - // { - // $dateString = $dataCore->format('m/d/Y'); - // // dd($dateString); - // $timestamp = strtotime($dataCore); - // // Format the timestamp into a date format - // $Year = date("Y", $timestamp); - // //dd($Year); - // $data = []; - // $data = DB::connection("db2")->table("STG_DB.VW_AA_DETAIL") - // ->select('LINKED_APPL_ID', 'CUSTOMER', 'RENEWAL_DATE', 'START_DATE', 'FIXED_RATE', 'BATCH_DATE', 'PRODUCT_LINE', 'ARR_STATUS') - // ->where('CUSTOMER', $cust) - // ->where('ARR_STATUS', '<>', 'CLOSE') - // //->where('PRODUCT_LINE', 'like', "%" .'DEPOSITS' ."%") - // ->where('LINKED_APPL_ID', $acc) - // //->where('BATCH_DATE', $dateString) - // ->groupBy('LINKED_APPL_ID', 'CUSTOMER', 'START_DATE', 'FIXED_RATE', 'BATCH_DATE', 'PRODUCT_LINE', 'ARR_STATUS','RENEWAL_DATE') - // ->orderBy('BATCH_DATE', 'DESC') - // ->limit(1); - // return $data; - // } public function getPinjaman($cus_no, $dateCore) { @@ -385,31 +288,16 @@ class Account extends Model return $data; } - // public function getAccountRK($cusNo, $date) - // { - // $data = []; - // $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") - // ->select('AC.ACCOUNT_NUMBER', 'AC.CUSTOMER_NO', 'CT.SHORT_NAME', 'AC.WORKING_BALANCE', 'AC.CURRENCY', 'AC.SHORT_TITLE', 'AC.OPENING_DATE', 'AC.BATCH_DATE', 'AC.CATEGORY', 'LT.EXPIRY_DATE', 'LT.AVAIL_AMT') - // ->join('STG_DB.LIMIT AS LT', 'AC.ACCOUNT_NUMBER', '=', 'LT.ACCOUNT') - // ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') - // ->where('AC.CUSTOMER_NO', $cusNo) - // ->where('AC.BATCH_DATE', $date) - // ->where('AC.LIMIT_REF', '<>', 'NULL') - // ->whereIn(DB::raw("LEFT(CATEGORY, 3)"), ['100','600','660','101']) - // ->limit(100); - // return $data; - // } + public function getAccountRK($arrCusNo, $date) { - $timestamp = strtotime($date); - // Format the timestamp into a date format - $Year = date("Y", $timestamp); + $data = []; $data = DB::connection("db2")->table("MIS.COLLECTION") ->selectRaw('ACCOUNT_NUMBER,MATURITY_DATE,MAX(BATCH_DATE) AS BATCH_DATE,MAX(OUTSTANDING) AS OUTSTANDING,LOAN_CCY,PRODUCT_LOAN,PRINCIPLE_AMOUNT,CURRENT_INTEREST_RATE,TENOR,FACILITY_TYPE,LIMIT_ID') - ->whereYear('TANGGAL_DATA', $Year) + ->where('TANGGAL_DATA', $date) ->whereIn(DB::raw("ACCOUNT_NUMBER"), $arrCusNo) //->where('LOAN_STATUS', 'CURRENT') ->groupBy('ACCOUNT_NUMBER', 'MATURITY_DATE', 'LOAN_CCY', 'PRODUCT_LOAN', 'PRINCIPLE_AMOUNT', 'CURRENT_INTEREST_RATE', 'TENOR','FACILITY_TYPE','LIMIT_ID') diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 65a2a87..dd9010d 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -419,7 +419,7 @@ class KonfirmasiBankController extends Controller } } - try { + // try { foreach ($listAccount as $key1 => $account) { @@ -603,11 +603,11 @@ class KonfirmasiBankController extends Controller return $pdf->stream($filename); - } catch (Exception $e) { - return redirect()->route('konfirmasibank.timeout'); - } + // } catch (Exception $e) { + // return redirect()->route('konfirmasibank.timeout'); + // } - return false; + // return false; } @@ -852,4 +852,4 @@ class KonfirmasiBankController extends Controller } -} \ No newline at end of file +}