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

fixed

Browse Source
This commit is contained in:
weiz 2024-01-06 18:17:43 +08:00
parent 5148ab57ce
commit 5ff90840f6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/contract/ContractLists.php
View File

@ -20,6 +20,7 @@ use app\common\model\auth\Admin;
use app\common\model\bid\BidBuyBiddingDocument;
use app\common\model\contract\Contract;
use app\common\lists\ListsSearchInterface;
use app\common\model\contract\ContractNegotiation;
use app\common\model\custom\Custom;
use app\common\model\finance\FinanceReturnedRecord;
use app\common\model\project\Project;
@ -91,7 +92,10 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
$data['contract_status_text'] = $data->contract_status_text;
$data['contract_pricing_method_text'] = $data->contract_pricing_method_text;
$data['business_director_name'] = $business_director['name'];
$data['negotiation_amount'] = ContractNegotiation::where('contract_id',$data['id'])->sum('negotiation_amount');
$data['reality_contract_amount'] = $data['amount'] + $data['negotiation_amount'];
$data['returned_amount'] = FinanceReturnedRecord::where('contract_id',$data['id'])->sum('amount');
$data['not_returned_amount'] = $data['reality_contract_amount'] - $data['returned_amount'];
return $data;
})
->toArray();

8
app/adminapi/logic/contract/ContractNegotiationLogic.php
View File

@ -66,8 +66,8 @@ class ContractNegotiationLogic extends BaseLogic
'profit_rate' => $profit_rate,
'negotiation_content' => $params['negotiation_content'] ?? '',
'negotiation_detail' => $params['negotiation_detail'] ?? '',
'negotiation_quotation' => $params['negotiation_quotation'] ?? null,
'negotiation_basis' => $params['negotiation_basis'] ?? null,
'negotiation_quotation' => !empty($params['negotiation_quotation']) ? $params['negotiation_quotation'] : null,
'negotiation_basis' => !empty($params['negotiation_basis']) ? $params['negotiation_basis'] : null,
]);
Db::commit();
return true;
@ -110,8 +110,8 @@ class ContractNegotiationLogic extends BaseLogic
'profit_rate' => $profit_rate,
'negotiation_content' => $params['negotiation_content'] ?? '',
'negotiation_detail' => $params['negotiation_detail'] ?? '',
'negotiation_quotation' => $params['negotiation_quotation'] ?? null,
'negotiation_basis' => $params['negotiation_basis'] ?? null,
'negotiation_quotation' => !empty($params['negotiation_quotation']) ? $params['negotiation_quotation'] : null,
'negotiation_basis' => !empty($params['negotiation_basis']) ? $params['negotiation_basis'] : null,
]);
Db::commit();
return true;