katam/konfirmasibank
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix export

Browse Source
This commit is contained in:
KhatamNugraha
2024-05-29 08:45:05 +07:00
parent a757b4b123
commit fa207d010d
2 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Entities/Account.php
View File

@ -67,7 +67,7 @@ class Account extends Model
public function getAccount($cif, $arrAccount, $startDate)
{
//$uppercaseKodeCabang = Str::upper($kodecabang);
$dateString = $startDate->format('m/d/Y');
// $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')
@ -75,7 +75,7 @@ class Account extends Model
->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID')
->where('CUSTOMER_NO', $cif)
->where('LIMIT_REF', null)
->where('AC.BATCH_DATE', $dateString)
->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')
@ -129,11 +129,11 @@ class Account extends Model
public function getArr($cust, $acc, $dataCore)
{
//$uppercaseKodeCabang = Str::upper($kodecabang);
$dateString = $dataCore->format('m/d/Y');
//$dateString = $dataCore->format('m/d/Y');
// dd($dateString);
$timestamp = strtotime($dataCore);
//$timestamp = strtotime($dataCore);
// Format the timestamp into a date format
$Year = date("Y", $timestamp);
//$Year = date("Y", $timestamp);
$data = DB::connection("db2")->table("STG_DB.VW_AA_DETAIL")
->selectRaw('ARRANGEMENT_ID,CUSTOMER,LINKED_APPL_ID,PRODUCT_LINE,MATURITY_DATE,RENEWAL_DATE,START_DATE,ARR_STATUS,BATCH_DATE,BASE_DATE')
@ -206,12 +206,14 @@ class Account extends Model
public function getFixedRate($arrangementId, $startDate)
{
$timestamp = strtotime($startDate);
$Year = date("Y", $timestamp);
$data = [];
$data = DB::connection("db2")->table("STG_DB.AA_ARR_INTEREST")
->select('FIXED_RATE')
// ->whereYear('BATCH_DATE',$startDate->format('Y'))
->where(DB::raw("LEFT(ID, 12)"), $arrangementId)
->where(DB::raw("RIGHT(ID, 10)"), 'like', "%" .$startDate->format('Y') ."%")
->where(DB::raw("RIGHT(ID, 10)"), 'like', "%" .$Year ."%")
->orderBy('ID', 'DESC')
->limit(1);
@ -364,4 +366,4 @@ class Account extends Model
}
}