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

update

Browse Source
This commit is contained in:
weiz 2024-05-24 10:11:29 +08:00
parent e64b30bad9
commit 35773b7425
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/cost_project/CostApprovedProjectController.php
View File

@ -129,6 +129,8 @@
default => 0, default => 0,
}; };
$data['project_id'] = $project['id']; $data['project_id'] = $project['id'];
$rate = bcdiv($data['total_refund_amount'], $data['signed_amount'], 2);
$data['refund_rate'] = ($rate * 100).'%';
}) })
->toArray(); ->toArray();
$count = MarketingCustom::where($where)->where('status', 1)->count(); $count = MarketingCustom::where($where)->where('status', 1)->count();

3
app/adminapi/lists/financial/FinancialInvoiceLists.php
View File

@ -77,7 +77,7 @@
$data['sign_time'] = $contract['create_time']; $data['sign_time'] = $contract['create_time'];
$data['invoice_type_text'] = $data->invoice_type_text; $data['invoice_type_text'] = $data->invoice_type_text;
$data['refund_amount'] = FinancialRefund::where('invoice_id', $data['id'])->sum('amount') ?? 0.00; $data['refund_amount'] = FinancialRefund::where('invoice_id', $data['id'])->sum('amount') ?? 0.00;
$rate = bcdiv($data['refund_amount'], $data['apply_amount'], 2); $rate = bcdiv($data['refund_amount'], $contract['signed_amount'], 2);
if (($rate * 100) <= 0) { if (($rate * 100) <= 0) {
$data['is_refund'] = '未到账(设定0%)'; $data['is_refund'] = '未到账(设定0%)';
} elseif (($rate * 100) <= 30) { } elseif (($rate * 100) <= 30) {
@ -89,6 +89,7 @@
} else { } else {
$data['is_refund'] = '已到账(设定100%)'; $data['is_refund'] = '已到账(设定100%)';
} }
$data['refund_rate'] = ($rate * 100).'%';
$last_refund = FinancialRefund::where('invoice_id', $data['id'])->order('id desc')->findOrEmpty(); $last_refund = FinancialRefund::where('invoice_id', $data['id'])->order('id desc')->findOrEmpty();
$data['refund_date'] = $last_refund['create_time'] ?? ''; $data['refund_date'] = $last_refund['create_time'] ?? '';
}) })

5
app/adminapi/lists/financial/FinancialRefundLists.php
View File

@ -63,15 +63,18 @@
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name,contract_type,signed_amount,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty();
$invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];
$data['part_b'] = $contract['part_b']; $data['part_b'] = $contract['part_b'];
$data['signed_amount'] = $contract['signed_amount'];
$data['invoice_code'] = $invoice['invoice_code']; $data['invoice_code'] = $invoice['invoice_code'];
$data['apply_amount'] = $invoice['apply_amount']; $data['apply_amount'] = $invoice['apply_amount'];
$rate = bcdiv($data['amount'], $contract['signed_amount'], 2);
$data['refund_rate'] = ($rate * 100).'%';
}) })
->toArray(); ->toArray();
} }

2
app/adminapi/lists/works/rcbg/OaWorkCommentLists.php
View File

@ -56,7 +56,7 @@ class OaWorkCommentLists extends BaseAdminDataLists implements ListsSearchInterf
public function lists(): array public function lists(): array
{ {
return OaWorkComment::where($this->searchWhere) return OaWorkComment::where($this->searchWhere)
->field(['id', 'work_id', 'admin_id', 'content']) ->field(['id', 'work_id', 'admin_id', 'content','create_time'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function($data){

3
app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
View File

@ -169,6 +169,9 @@ class SupervisionProjectLogic extends BaseLogic
$data['build_unit_name'] = $data->build_unit_name_text; $data['build_unit_name'] = $data->build_unit_name_text;
$data['contract_name'] = $data->contract_name_text; $data['contract_name'] = $data->contract_name_text;
$data['project_manager_name'] = $data->project_manager_name_text; $data['project_manager_name'] = $data->project_manager_name_text;
$data['implementation_department_name'] = $data->implementation_department_name_text;
$data['supervision_department_name'] = $data->supervision_department_name_text;
$data['project_department_name'] = $data->project_department_name_text;
return $data->toArray(); return $data->toArray();
} }