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

Merge pull request 'zhangwei' (#129) from zhangwei into dev

Browse Source 
Reviewed-on: #129
This commit is contained in:
weiz 2024-01-08 09:47:19 +08:00
commit 9afeaeb2ef
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,10 @@ 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\FinanceInvoiceApply;
use app\common\model\finance\FinanceRefundApply;
use app\common\model\finance\FinanceReturnedRecord;
use app\common\model\project\Project;
use think\facade\Db;
@ -91,7 +94,22 @@ 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['returned_amount'] = FinanceReturnedRecord::where('contract_id',$data['id'])->sum('amount');
//开票金额
$data['invoicing_amount'] = FinanceInvoiceApply::where('contract_id',$data['id'])->sum('invoicing_amount');
//退款金额
$data['refund_amount'] = FinanceRefundApply::where('contract_id',$data['id'])->sum('amount');
//实际合同金额=合同金额+洽商金额-退款金额
$data['reality_contract_amount'] = $data['amount'] + $data['negotiation_amount'] - $data['refund_amount'];
//未回款金额
$data['not_returned_amount'] = $data['reality_contract_amount'] - $data['returned_amount'];
//未开票金额
$data['not_invoicing_amount'] = $data['reality_contract_amount'] - $data['invoicing_amount'];
//结算差异（带计算）
$data['settlement_difference'] = 0;
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;