update margin export pdf

This commit is contained in:
KhatamNugraha
2023-09-26 18:09:00 +07:00
parent 62b908a314
commit 60886ef174
4 changed files with 137 additions and 105 deletions

View File

@ -39,7 +39,6 @@ class ViewAccount extends Model
];
public function getSearchAccount($cif ,$arrAccount, $kodecabang, $startDate, $endDate){
// $store = DB::connection('oracle');
$today = Carbon::now();
$currentYear = $today->format("Y");
$pastYear = $today->subYear(3)->format('Y');
@ -51,12 +50,13 @@ class ViewAccount extends Model
// dd($arrAccount);
if($arrAccount == null){
//dd('1');
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT")
->select( 'CUSTOMER_NO', 'ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'),DB::raw('MAX(CATEGORY) AS CATEGORY'))
->where('CUSTOMER_NO',$cif)
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
->whereBetween('OPENING_DATE', [$startDate, $endDate])
// ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660'])
->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE');
}else{
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT")
@ -84,21 +84,29 @@ class ViewAccount extends Model
$currentYear = $today->format("Y");
$pastYear = $today->subYear(3)->format('Y');
$uppercaseKodeCabang = Str::upper($kodecabang);
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT")
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT")
->select( 'CUSTOMER_NO', 'ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'),DB::raw('MAX(CATEGORY) AS CATEGORY'))
->where('CUSTOMER_NO',$cif)
->whereIn('ACCOUNT_NUMBER', $arrAccount)
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
->whereBetween('OPENING_DATE', [$startDate, $endDate])
->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660'])
->whereIn('ACCOUNT_NUMBER', $arrAccount)
->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE');
// $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT")
// ->select( 'CUSTOMER_NO', 'ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'),DB::raw('MAX(CATEGORY) AS CATEGORY'))
// ->where('CUSTOMER_NO',$cif)
// // ->whereIn('ACCOUNT_NUMBER', $arrAccount)
// ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
// ->whereBetween('OPENING_DATE', [$startDate, $endDate])
// ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660'])
// ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE');
return $data;
}
public function getAAaccount($cus_no,$acc_no){
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_ACCOUNT")->select('ARRANGEMENT_ID','PRODUCT_LINE','PRODUCT','CUSTOMER','LINKED_APPL_ID','MATURITY_DATE')
$data = [];
$data = DB::connection("db2")->table("STG_DB.VW_AA_ARR_NEW")->select('ARRANGEMENT_ID','PRODUCT_LINE','PRODUCT','CUSTOMER','LINKED_APPL_ID','MATURITY_DATE')
->where('CUSTOMER', $cus_no)
->where('LINKED_APPL_ID', $acc_no)
->get();
@ -121,7 +129,9 @@ class ViewAccount extends Model
$data = DB::connection("db2")->table("STG_DB.VW_AA_ARR_NEW")
->select('*')
->where('CUSTOMER',$cus_no)
//->where(DB::raw("LEFT(CATEGORY, 1)") , 3)
->whereIn('ACCOUNT_NUMBER', $arrAccount);
return $data;
}
@ -185,4 +195,4 @@ class ViewAccount extends Model
return $data;
}
}
}