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

更新: 重构代码并优化财务统计逻辑中的筛选功能

Browse Source
This commit is contained in:
mkm 2024-07-09 14:28:10 +08:00
parent deb451b0fd
commit 8fa6f4e757
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ namespace app\adminapi\logic\consult_basic;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject; use app\common\model\consult_basic\ConsultProject;
use app\common\model\dict\DictData;
use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement; use app\common\model\financial\FinancialSettlement;
@ -24,9 +25,12 @@ class ConsultStatisticsLogic extends BaseLogic
$where1=[ $where1=[
['review_status', '=', 1], ['review_status', '=', 1],
['contract_type', '=', 0], ['contract_type', '=', 0],
['business_nature', '=', 3],
['status', '=', 0] ['status', '=', 0]
]; ];
$DictData=DictData::where('type_value','consult')->column('value');
if($DictData){
$where1[]=['business_nature','in',$DictData];
}
$total_apply_amount = $marketingContract->statistics_count($where1, $time, 'sum', ''); $total_apply_amount = $marketingContract->statistics_count($where1, $time, 'sum', '');
$apply_amount_value = $marketingContract->statistics_count($where1, $time, 'group', 'create_time'); $apply_amount_value = $marketingContract->statistics_count($where1, $time, 'group', 'create_time');
$data[] = [ $data[] = [

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

@ -6,6 +6,7 @@ namespace app\adminapi\logic\manage_basic;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject; use app\common\model\consult_basic\ConsultProject;
use app\common\model\dict\DictData;
use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement; use app\common\model\financial\FinancialSettlement;
@ -31,14 +32,17 @@ class ManageStatisticsLogic extends BaseLogic
$financialRefund = new FinancialRefund(); $financialRefund = new FinancialRefund();
$financialSettlement = new FinancialSettlement(); $financialSettlement = new FinancialSettlement();
$where_1=[ $where1=[
['review_status', '=', 1], ['review_status', '=', 1],
['contract_type', '=', 0], ['contract_type', '=', 0],
['business_nature', '=', 2], ['status', '=', 0]
['status', '=', 0] ];
]; $DictData=DictData::where('type_value','management')->column('value');
$total_apply_amount = $marketingContract->statistics_count($where_1, $time, 'sum', ''); if($DictData){
$apply_amount_value = $marketingContract->statistics_count($where_1, $time, 'group', 'create_time'); $where1[]=['business_nature','in',$DictData];
}
$total_apply_amount = $marketingContract->statistics_count($where1, $time, 'sum', '');
$apply_amount_value = $marketingContract->statistics_count($where1, $time, 'group', 'create_time');
$data[] = [ $data[] = [
'title' => '待立项项目', 'title' => '待立项项目',
'desc' => '', 'desc' => '',