fixing data pinjaman

This commit is contained in:
KhatamNugraha
2024-07-04 12:56:19 +07:00
parent d93b37f7fe
commit 7855162c69
2 changed files with 49 additions and 37 deletions

View File

@ -43,17 +43,18 @@ class Account extends Model
if($arrAccount == null) {
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
->selectRaw('AC.CUSTOMER_NO,AC.ACCOUNT_NUMBER,AC.BATCH_DATE,AC.WORKING_BALANCE,CP.COMPANY_NAME,AC.CURRENCY,CT.SHORT_NAME')
->selectRaw('AC.CUSTOMER_NO,AC.ACCOUNT_NUMBER,AC.BATCH_DATE,AC.OPEN_ACTUAL_BAL,CP.COMPANY_NAME,AC.CURRENCY,CT.SHORT_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('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
// ->where('ARR_A', null)
//->where('LIMIT_REF', null)
// ->where('INACTIV_MARKER', null)
->where('AC.BATCH_DATE', $startDate)
// ->whereIn(DB::raw("LEFT(CATEGORY, 3)"), ['100','600','660','101'])
->whereIn(DB::raw("LEFT(CATEGORY, 2)"), ['10','60','66','30','31','32','33'])
// ->orWhere(DB::raw("LEFT(CATEGORY, 2)"),'32')
->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','AC.BATCH_DATE','WORKING_BALANCE','COMPANY_NAME','CURRENCY','SHORT_NAME')
->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','AC.BATCH_DATE','OPEN_ACTUAL_BAL','COMPANY_NAME','CURRENCY','SHORT_NAME')
->limit(100);
} else {
$data = DB::connection("db2")->table("STG_DB.ACCOUNT")
@ -89,11 +90,11 @@ class Account extends Model
// $dateString = $startDate->format('m/d/Y');
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY,AC.ACCOUNT_NUMBER,AC.CURRENCY, AC.SHORT_TITLE,AC.OPENING_DATE,AC.WORKING_BALANCE, AC.CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME,AC.BATCH_DATE')
->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY,AC.ACCOUNT_NUMBER,AC.CURRENCY, AC.SHORT_TITLE,AC.OPENING_DATE,AC.OPEN_ACTUAL_BAL, AC.CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME,AC.BATCH_DATE')
->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('LIMIT_REF', null)
->where('AC.BATCH_DATE', $startDate)
->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','101','600'])
@ -164,13 +165,22 @@ class Account extends Model
{
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_ARR")
->select('LINKED_APPL_ID', 'ARRANGEMENT_ID', 'CUSTOMER', 'BATCH_DATE', 'START_DATE', 'PRODUCT_LINE', 'PRODUCT', 'ARR_STATUS', 'CURRENCY', 'TERM', 'MATURITY_DATE', 'RENEWAL_DATE', 'FIXED_RATE')
->where('CUSTOMER', $cus_no)
->where('ARR_STATUS', 'CURRENT')
->where('BATCH_DATE', $dateCore)
->where('ARR_STATUS', '<>', 'CLOSE')
->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%")
// $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR")
// ->select('LINKED_APPL_ID', 'ARRANGEMENT_ID', 'CUSTOMER', 'BATCH_DATE', 'START_DATE', 'PRODUCT_LINE', 'PRODUCT', 'ARR_STATUS', 'CURRENCY', 'TERM', 'MATURITY_DATE', 'RENEWAL_DATE', 'FIXED_RATE')
// ->where('CUSTOMER', $cus_no)
// ->where('ARR_STATUS', 'CURRENT')
// ->where('BATCH_DATE', $dateCore)
// ->where('ARR_STATUS', '<>', 'CLOSE')
// ->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%")
// ->limit(100);
$data = DB::connection("db2")->table("MIS.VW_LOAN")
->select('*')
->where('SK_NASABAH', $cus_no)
//->where('ARR_STATUS', 'CURRENT')
->where('PERIODE', $dateCore)
// ->where('ARR_STATUS', '<>', 'CLOSE')
// ->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%")
->limit(100);
return $data;