Merge pull request 'update' (#187) from zhangwei into dev
Reviewed-on: #187
This commit is contained in:
commit
579d2c902d
@ -18,6 +18,7 @@ namespace app\adminapi\lists\finance;
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\contract\ProcurementContract;
|
||||
use app\common\model\contract\SubcontractingContract;
|
||||
use app\common\model\finance\FinancePaymentApply;
|
||||
use app\common\model\finance\FinancePaymentPlan;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
use app\common\model\project\Project;
|
||||
@ -79,7 +80,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
|
||||
}
|
||||
$data['contract_no'] = $contract['contract_no'];
|
||||
$data['contract_name'] = $contract['contract_name'];
|
||||
$data['has_payment_amount'] = 0;
|
||||
$data['has_payment_amount'] = FinancePaymentApply::where('finance_payment_plan_id',$data['id'])->sum('amount');
|
||||
$data['not_payment_amount'] = $data['amount'] - $data['has_payment_amount'];
|
||||
return $data;
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user