update temuan sit 11092023
This commit is contained in:
@ -38,7 +38,8 @@ class ViewAccount extends Model
|
||||
'ARRANGEMENT_ID'"
|
||||
];
|
||||
|
||||
public function getSearchAccount($cif , $kodecabang, $periode){
|
||||
public function getSearchAccount($cif , $kodecabang, $startDate, $endDate){
|
||||
// dd($cif , $kodecabang, $startDate, $endDate);
|
||||
// $store = DB::connection('oracle');
|
||||
$today = Carbon::now();
|
||||
$currentYear = $today->format("Y");
|
||||
@ -47,21 +48,27 @@ class ViewAccount extends Model
|
||||
|
||||
$data = [];
|
||||
|
||||
if ($cif != null && $kodecabang == null && $periode == null) {
|
||||
if ($cif != null && $kodecabang == null && $startDate == null) {
|
||||
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
|
||||
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
|
||||
->where('CUSTOMER_NO',$cif)
|
||||
->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
|
||||
} elseif ($cif != null && $kodecabang != null && $periode == null) {
|
||||
dd('tess2');
|
||||
->whereBetween('BATCH_DATE', [$startDate, $endDate])
|
||||
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
|
||||
} elseif ($cif != null && $kodecabang != null && $startDate == null) {
|
||||
|
||||
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
|
||||
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
|
||||
->where('CUSTOMER_NO',$cif)
|
||||
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
|
||||
->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
|
||||
->whereBetween('BATCH_DATE', [$startDate, $endDate])
|
||||
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
|
||||
}else {
|
||||
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
|
||||
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
|
||||
->where('CUSTOMER_NO',$cif)
|
||||
->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
|
||||
->where('BATCH_DATE','LIKE','%'.$periode.'%');
|
||||
->whereBetween('BATCH_DATE', [$startDate, $endDate])
|
||||
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE');
|
||||
}
|
||||
|
||||
return $data;
|
||||
@ -69,7 +76,11 @@ class ViewAccount extends Model
|
||||
|
||||
public function getAccount($cus_no,$account,$kodecabang,$periode){
|
||||
$data = [];
|
||||
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")->select('*')->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account)->get();
|
||||
$data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
|
||||
->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'))
|
||||
->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account)
|
||||
->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE')
|
||||
->get();
|
||||
return $data;
|
||||
}
|
||||
|
||||
@ -134,4 +145,4 @@ class ViewAccount extends Model
|
||||
return $data;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user