xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

关联查询优化

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-09-28 09:47:09 +08:00
parent ae6cd4ec78
commit 40dfd99f4e
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/FinPaymentApplyController.php
+23 -10
View File
@@ -37,13 +37,13 @@ class FinPaymentApplyController extends BaseController
if (isset($data['sales_user_id'])) //业务员 if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name;
if (isset($data['corp_id'])) //公司(渠道) if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->first()->item_label; $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name; $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
if (isset($data['country_id'])) //付款来源国家 if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->first()->cn_addr; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
$OssService = new OssService(); $OssService = new OssService();
if (isset($data['submit_files'])){ if (isset($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true); $data['submit_files'] = json_decode($data['submit_files'], true);
@@ -55,7 +55,8 @@ class FinPaymentApplyController extends BaseController
]; ];
} }
} }
if (isset($data['voucher_file'])) $data['voucher_file_full'] = '';
if (!empty($data['voucher_file']))
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']); $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
if (isset($data['created_at'])) if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
@@ -77,15 +78,27 @@ class FinPaymentApplyController extends BaseController
if (isset($data['sales_user_id'])) //业务员 if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name;
if (isset($data['corp_id'])) //公司(渠道) if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->first()->item_label; $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name; $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
if (isset($data['country_id'])) //付款来源国家 if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['country_id'])->first()->cn_addr; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (isset($data['submit_files'])) $OssService = new OssService();
if (isset($data['submit_files'])){
$data['submit_files'] = json_decode($data['submit_files'], true); $data['submit_files'] = json_decode($data['submit_files'], true);
foreach ($data['submit_files'] as $key => $value) {
$data['submit_files'][$key] = [
'file_src' => $value['file_src'],
'file_full' => $OssService->generatePrivateUrl($value['file_src']),
'file_name' => $value['file_name'],
];
}
}
$data['voucher_file_full'] = '';
if (!empty($data['voucher_file']))
$data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
if (isset($data['created_at'])) if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at'])) if (isset($data['updated_at']))
app/common/controller/FinReceiptController.php
+8 -7
View File
@@ -37,12 +37,13 @@ class FinReceiptController extends BaseController
if (isset($data['received_at'])) if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']); $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name; $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
if (isset($data['country_id'])) //付款来源国家 if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (isset($data['fx_receipt_file'])) $data['fx_receipt_file_full'] = '';
if (!empty($data['fx_receipt_file']))
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
return $data; return $data;
} }
@@ -64,11 +65,11 @@ class FinReceiptController extends BaseController
if (isset($data['received_at'])) if (isset($data['received_at']))
$data['received_at'] = date('Y-m-d H:i:s', $data['received_at']); $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
$data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name; $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
if (isset($data['country_id'])) //付款来源国家 if (isset($data['country_id'])) //付款来源国家
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr; $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
if (isset($data['currency_id'])) //付款币种 if (isset($data['currency_id'])) //付款币种
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
if (isset($data['fx_receipt_file'])) if (isset($data['fx_receipt_file']))
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
return $data; return $data;