mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'update' (#187) from zhangwei into dev

Browse Source 
Reviewed-on: #187
This commit is contained in:
weiz 2024-01-17 16:09:05 +08:00
commit 579d2c902d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/lists/finance/FinancePaymentPlanLists.php
View File

@ -18,6 +18,7 @@ namespace app\adminapi\lists\finance;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\contract\ProcurementContract; use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract; use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentApply;
use app\common\model\finance\FinancePaymentPlan; use app\common\model\finance\FinancePaymentPlan;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\project\Project; use app\common\model\project\Project;
@ -79,7 +80,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
} }
$data['contract_no'] = $contract['contract_no']; $data['contract_no'] = $contract['contract_no'];
$data['contract_name'] = $contract['contract_name']; $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']; $data['not_payment_amount'] = $data['amount'] - $data['has_payment_amount'];
return $data; return $data;
}) })