|
@@ -388,10 +388,13 @@ class AuxiliaryAccountService extends Service
|
|
|
private function getDetail($id){
|
|
private function getDetail($id){
|
|
|
$data = AuxiliaryAccountDetails::where('del_time',0)
|
|
$data = AuxiliaryAccountDetails::where('del_time',0)
|
|
|
->where('auxiliary_account_id', $id)
|
|
->where('auxiliary_account_id', $id)
|
|
|
- ->select('*')
|
|
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
|
|
+ $map = Fee::whereIn('id', array_unique(array_column($data,'fee_id')))
|
|
|
|
|
+ ->pluck('title','id')
|
|
|
|
|
+ ->all();
|
|
|
foreach ($data as &$v){
|
|
foreach ($data as &$v){
|
|
|
$v['voucher_date'] = $this->utcTime($v['voucher_date']);
|
|
$v['voucher_date'] = $this->utcTime($v['voucher_date']);
|
|
|
|
|
+ $v['fee_title'] = $map[$v['fee_id']] ?? "";
|
|
|
}
|
|
}
|
|
|
return $data;
|
|
return $data;
|
|
|
}
|
|
}
|
