update
This commit is contained in:
parent
1133e73ec2
commit
18013bf4b8
@ -17,6 +17,7 @@
|
||||
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
use app\common\model\dept\Dept;
|
||||
use app\common\model\financial\FinancialBudgetDocDetail;
|
||||
|
||||
|
||||
@ -58,7 +59,11 @@
|
||||
->field(['id', 'budget_doc_id', 'dept_id', 'type', 'amount', 'remark'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()
|
||||
->select()->each(function ($data) {
|
||||
$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
|
||||
$data['dept_name'] = $dept['name'];
|
||||
$data['type_text'] = $data->type_text;
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
||||
|
@ -63,8 +63,13 @@
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function ($data) {
|
||||
$contract = CostApprovedProject::field('contract_name')->where('id', $data['contract_id'])->findOrEmpty();
|
||||
$contract = CostApprovedProject::field('contract_name,part_a,create_date,money,contract_type')->where('id', $data['contract_id'])->findOrEmpty();
|
||||
$data['contract_name'] = $contract['contract_name'];
|
||||
$data['part_a'] = $contract['part_a'];
|
||||
$data['create_date'] = $contract['create_date'];
|
||||
$data['money'] = $contract['money'];
|
||||
$data['contract_type'] = $contract['contract_type'];
|
||||
$data['contract_type_text'] = $contract->contract_type_text;
|
||||
$data['total_amount'] = FinancialBudgetDocDetail::where('budget_doc_id', $data['id'])->sum('amount');
|
||||
})
|
||||
->toArray();
|
||||
|
Loading…
x
Reference in New Issue
Block a user