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

Update: refactor code and improve statistics functions in ConsultStatisticsLogic, CostProjectStatisticsLogic, ManageStatisticsLogic, and FinancialStatisticsLogic

Browse Source
This commit is contained in:
mkm 2024-07-06 09:42:41 +08:00
parent 3454094113
commit ef28535256
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php
View File

@ -41,7 +41,7 @@ class ConsultStatisticsLogic extends BaseLogic
]; ];
$contract_ids = $consultProject->group('contract')->column('contract'); $contract_ids = $consultProject->whereBetweenTime('create_time', strtotime($time['start_time']), strtotime($time['end_time']))->group('contract')->column('contract');
//开票金额 //开票金额
$where[]=['contract_id','in',$contract_ids]; $where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount'); $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');

2
app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php
View File

@ -81,7 +81,7 @@ class CostProjectStatisticsLogic extends BaseLogic
'value' => $apply_amount_value['y'] ?? 0, 'value' => $apply_amount_value['y'] ?? 0,
'type' => 1, 'type' => 1,
]; ];
$contract_ids = $CostProject->group('contract_id')->column('contract_id'); $contract_ids = $CostProject->whereBetweenTime('create_time', strtotime($time['start_time']), strtotime($time['end_time']))->group('contract_id')->column('contract_id');
$where[]=['contract_id','in',$contract_ids]; $where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount'); $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');

6
app/adminapi/logic/financial/FinancialStatisticsLogic.php
View File

@ -12,6 +12,7 @@ use app\common\model\financial\FinancialPerformanceMoneyApply;
use app\common\model\financial\FinancialPerformanceMoneyRecovery; use app\common\model\financial\FinancialPerformanceMoneyRecovery;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialRepayment; use app\common\model\financial\FinancialRepayment;
use app\common\model\financial\FinancialSettlement;
use app\common\model\financial\FinancialUsingFunds; use app\common\model\financial\FinancialUsingFunds;
class FinancialStatisticsLogic extends BaseLogic class FinancialStatisticsLogic extends BaseLogic
@ -34,6 +35,7 @@ class FinancialStatisticsLogic extends BaseLogic
$financialUsingFunds = new FinancialUsingFunds(); $financialUsingFunds = new FinancialUsingFunds();
$financialBorrowMoney = new FinancialBorrowMoney(); $financialBorrowMoney = new FinancialBorrowMoney();
$financialRepayment = new FinancialRepayment(); $financialRepayment = new FinancialRepayment();
$financialSettlement = new FinancialSettlement();
//开票金额 //开票金额
$total_apply_amount = $marketingContract->ContractFinancialMoney([], $time, 'sum', '', 'apply_amount'); $total_apply_amount = $marketingContract->ContractFinancialMoney([], $time, 'sum', '', 'apply_amount');
$apply_amount_value = $marketingContract->ContractFinancialMoney([], $time, 'group', 'create_time', 'apply_amount'); $apply_amount_value = $marketingContract->ContractFinancialMoney([], $time, 'group', 'create_time', 'apply_amount');
@ -55,8 +57,8 @@ class FinancialStatisticsLogic extends BaseLogic
'type' => 1, 'type' => 1,
]; ];
//结算金额 //结算金额
$total_capply_amount=$marketingContract->ContractFinancialMoney([],$time,'sum','','amount'); $total_capply_amount=$financialSettlement->statistics([],$time,'sum','','amount');
$total_apply_amount_value=$marketingContract->ContractFinancialMoney([],$time,'group','create_time','amount'); $total_apply_amount_value=$financialSettlement->statistics([],$time,'group','create_time','amount');
$data[]=[ $data[]=[
'title' => '回款金额', 'title' => '回款金额',
'desc' => '', 'desc' => '',

2
app/adminapi/logic/manage_basic/ManageStatisticsLogic.php
View File

@ -56,7 +56,7 @@ class ManageStatisticsLogic extends BaseLogic
'type' => 1, 'type' => 1,
]; ];
$contract_ids = $consultProject->group('contract')->column('contract'); $contract_ids = $consultProject->whereBetweenTime('create_time', strtotime($time['start_time']), strtotime($time['end_time']))->group('contract')->column('contract');
//开票金额 //开票金额
$where[]=['contract_id','in',$contract_ids]; $where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount'); $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');