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-03-21 16:38:36 +07:00
parent 11c56f35bb
commit 0ef23f5924
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Entities/Account.php
View File

@ -73,7 +73,7 @@ class Account extends Model
// $uppercaseKodeCabang = Str::upper($kodecabang); // $uppercaseKodeCabang = Str::upper($kodecabang);
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
->selectRaw('AC.CUSTOMER_NO, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,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') ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,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.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID')
->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID') ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID')
->where('CUSTOMER_NO',$cif) ->where('CUSTOMER_NO',$cif)
@ -82,7 +82,7 @@ class Account extends Model
->where('AC.BATCH_DATE',$startDate) ->where('AC.BATCH_DATE',$startDate)
->whereIn('AC.ACCOUNT_NUMBER', $arrAccount) ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
//->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101']) //->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME') ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME','CATEGORY')
->orderBy('SHORT_NAME', 'ASC') ->orderBy('SHORT_NAME', 'ASC')
->limit(100); ->limit(100);
return $data; return $data;

5
Http/Controllers/KonfirmasiBankController.php
View File

@ -358,7 +358,6 @@
$arrAccount = explode("," , $request['accNo']); $arrAccount = explode("," , $request['accNo']);
$startDate = Carbon::parse($request['startDate2']); $startDate = Carbon::parse($request['startDate2']);
$dateCore = $startDate->subDays(2); $dateCore = $startDate->subDays(2);
$Account = new Account; $Account = new Account;
$data = []; $data = [];
$DataAccounts = []; $DataAccounts = [];
@ -396,7 +395,7 @@
$DataPinjaman[$key2]['ARRANGEMENT_ID'] = $pinjaman->ARRANGEMENT_ID; $DataPinjaman[$key2]['ARRANGEMENT_ID'] = $pinjaman->ARRANGEMENT_ID;
$DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE; $DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE;
$DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY; $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY;
$DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT_LINE; $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT;
$DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($balance->WORKING_BALANCE, 2, ',', '.') ?? ''; $DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($balance->WORKING_BALANCE, 2, ',', '.') ?? '';
$DataPinjaman[$key2]['TERM'] = $pinjaman->TERM ?? ''; $DataPinjaman[$key2]['TERM'] = $pinjaman->TERM ?? '';
$DataPinjaman[$key2]['FIXED_RATE'] = $pinjaman->FIXED_RATE ?? ''; $DataPinjaman[$key2]['FIXED_RATE'] = $pinjaman->FIXED_RATE ?? '';
@ -437,7 +436,7 @@
$data['DataCustomer'] = $GetCustomer ?? ''; $data['DataCustomer'] = $GetCustomer ?? '';
$data['localDate'] = $tanggalIndonesia; $data['localDate'] = $tanggalIndonesia;
$data['today'] = $today; $data['today'] = $today;
$data['batchDate'] = $startDate->format('d-m-Y'); $data['batchDate'] = $startDate->addDays(2)->format('d-m-Y');
$data['infoSuratOld'] = $infoSuratOld; $data['infoSuratOld'] = $infoSuratOld;
$data['infoSuratNew'] = $infoSuratNew; $data['infoSuratNew'] = $infoSuratNew;