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

(Update: refactor code and improve statistics functions in ConsultStatisticsController, FinancialStatisticsController, BaseModel, FinancialBidMargin, FinancialBidMarginRecovery, and FinancialInvoice)

Browse Source
This commit is contained in:
mkm 2024-07-05 09:57:01 +08:00
parent 3a194a6547
commit 4f0252031f
8 changed files with 569 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/adminapi/controller/manage_basic/ManageStatisticsController.php
View File

@ -3,6 +3,7 @@
namespace app\adminapi\controller\manage_basic;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\logic\manage_basic\ManageStatisticsLogic;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement;
@ -12,7 +13,17 @@
class ManageStatisticsController extends BaseAdminController
{
public function project(){
public function index()
{
$date = $this->request->get('date', '');
$where = [];
$time = getDay($date);
$res = ManageStatisticsLogic::ManageStatistics($where, $time);
return $this->data($res);
}
public function project()
{
//待立项项目
$pending_project_num = MarketingContract::field('id')->where([
['review_status', '=', 1],
@ -35,7 +46,8 @@
return $this->success('success', $result);
}
public function invoice(){
public function invoice()
{
$year = $this->request->get('year', date('Y'));
$contract_ids = ManageProject::column('contract');
//总开票金额
@ -68,12 +80,23 @@
$settlement_series['data'][] = FinancialSettlement::where('contract_id', 'in', $contract_ids)->whereMonth('date', $year . '-' . $v)->sum('amount');
$v = $v . '月';
}
$result = compact('total_invoice_amount','year_invoice_amount','total_refund_amount','year_refund_amount','total_settlement_amount','year_settlement_amount',
'column','invoice_series','refund_series','settlement_series');
$result = compact(
'total_invoice_amount',
'year_invoice_amount',
'total_refund_amount',
'year_refund_amount',
'total_settlement_amount',
'year_settlement_amount',
'column',
'invoice_series',
'refund_series',
'settlement_series'
);
return $this->success('success', $result);
}
public function metered_payment(){
public function metered_payment()
{
$year = $this->request->get('year', date('Y'));
//统计总的进度
$total_done = ManageMeteredPayment::sum('month_amount');
@ -97,8 +120,15 @@
$payment_series['data'][] = ManageMeteredPayment::whereMonth('date', $year . '-' . $v)->sum('month_pay');
$v = $v . '月';
}
$result = compact('total_done','year_done','total_payment','year_payment',
'column','complete_series','payment_series');
$result = compact(
'total_done',
'year_done',
'total_payment',
'year_payment',
'column',
'complete_series',
'payment_series'
);
return $this->success('success', $result);
}
}

49
app/adminapi/controller/supervision_project/SupervisionStatisticsController.php
View File

@ -3,6 +3,7 @@
namespace app\adminapi\controller\supervision_project;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\logic\supervision_project\SupervisionProjectStatisticsLogic;
use app\common\model\dict\DictData;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
@ -14,8 +15,17 @@
class SupervisionStatisticsController extends BaseAdminController
{
public function index()
{
$date = $this->request->get('date', '');
$where = [];
$time = getDay($date);
$res = SupervisionProjectStatisticsLogic::consultStatistics($where, $time);
return $this->data($res);
}
//项目立项统计
public function project(){
public function project()
{
//待立项项目
$pending_project_num = MarketingContract::field('id')->where([
['review_status', '=', 1],
@ -39,7 +49,8 @@
}
//项目问题统计
public function problem(){
public function problem()
{
$problem_cate = DictData::where('type_value', 'problem_cate')->column('name', 'value');
$data = [];
foreach ($problem_cate as $k => $v) {
@ -54,7 +65,8 @@
}
//项目月报统计
public function month_report(){
public function month_report()
{
$year = $this->request->get('year', date('Y'));
//统计总的进度
$total_schedule = SupervisionProjectMonthlyReport::sum('this_month_progress');
@ -87,12 +99,23 @@
$payment_series['data'][] = SupervisionProjectMonthlyReport::whereMonth('date', $year . '-' . $v)->sum('total_pay');
$v = $v . '月';
}
$result = compact('total_schedule','year_schedule','total_complete','year_complete','total_payment','year_payment',
'column','schedule_series','complete_series','payment_series');
$result = compact(
'total_schedule',
'year_schedule',
'total_complete',
'year_complete',
'total_payment',
'year_payment',
'column',
'schedule_series',
'complete_series',
'payment_series'
);
return $this->success('success', $result);
}
public function invoice(){
public function invoice()
{
$year = $this->request->get('year', date('Y'));
$contract_ids = SupervisionProject::column('contract');
//总开票金额
@ -125,8 +148,18 @@
$settlement_series['data'][] = FinancialSettlement::where('contract_id', 'in', $contract_ids)->whereMonth('date', $year . '-' . $v)->sum('amount');
$v = $v . '月';
}
$result = compact('total_invoice_amount','year_invoice_amount','total_refund_amount','year_refund_amount','total_settlement_amount','year_settlement_amount',
'column','invoice_series','refund_series','settlement_series');
$result = compact(
'total_invoice_amount',
'year_invoice_amount',
'total_refund_amount',
'year_refund_amount',
'total_settlement_amount',
'year_settlement_amount',
'column',
'invoice_series',
'refund_series',
'settlement_series'
);
return $this->success('success', $result);
}
}

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

@ -1,12 +1,79 @@
<?php
namespace app\adminapi\logic\consult_basic;
use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement;
use app\common\model\marketing\MarketingContract;
class ConsultStatisticsLogic extends BaseLogic
{
public static function consultStatistics($param)
public static function consultStatistics($where, $time)
{
return app('consult_basic')->consultStatistics($param);
}
}
$data = [];
$datearr = explode('-', $time);
$time = TimeConvert(['start_time' => $datearr[0], 'end_time' => $datearr[1]]);
$marketingContract = new MarketingContract();
$consultProject = new ConsultProject();
$financialInvoice = new FinancialInvoice();
$financialRefund = new FinancialRefund();
$financialSettlement = new FinancialSettlement();
$total_apply_amount = $marketingContract->statistics_count([], $time, 'sum', '');
$apply_amount_value = $marketingContract->statistics_count([], $time, 'group', 'create_time');
$data[] = [
'title' => '待立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$total_apply_amount = $consultProject->statistics_count([], $time, 'sum', '');
$apply_amount_value = $consultProject->statistics_count([], $time, 'group', 'create_time');
$data[] = [
'title' => '已立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$contract_ids = $consultProject->column('contract');
//开票金额
$where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
$apply_amount_value = $financialInvoice->ContractFinancialMoney($where, $time, 'group', 'create_time', 'apply_amount');
$data[] = [
'title' => '开票金额',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
//回款金额
$total_amount = $financialRefund->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialRefund->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '回款金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
//结算金额
$total_amount = $financialSettlement->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialSettlement->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '结算金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
return $data;
}
}

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

@ -72,7 +72,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '保证金申请',
'desc' => '',
'total_money' => $total_bid_margin,
'value' => $bid_margin_value['y'],
'value' => $bid_margin_value['y']??[],
'type' => 1,
];
//保证金回收
@ -82,7 +82,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '保证金回收',
'desc' => '',
'total_money' => $total_pay_amount,
'value' => $pay_amount_value['y'],
'value' => $pay_amount_value['y']??[],
'type' => 1,
];
//履约申请
@ -92,7 +92,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '履约申请',
'desc' => '',
'total_money' => $apply_amount,
'value' => $apply_amount_value['y'],
'value' => $apply_amount_value['y']??[],
'type' => 1,
];
//履约回收
@ -102,7 +102,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '履约回收',
'desc' => '',
'total_money' => $recovery_amount,
'value' => $recovery_amount_value['y'],
'value' => $recovery_amount_value['y']??[],
'type' => 1,
];
//用款
@ -112,7 +112,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '用款',
'desc' => '',
'total_money' => $has_pay_amount,
'value' => $has_pay_amount_value['y'],
'value' => $has_pay_amount_value['y']??[],
'type' => 1,
];
//借款
@ -122,7 +122,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '借款',
'desc' => '',
'total_money' => $amount,
'value' => $amount_value['y'],
'value' => $amount_value['y']??[],
'type' => 1,
];
//还款
@ -132,7 +132,7 @@ class FinancialStatisticsLogic extends BaseLogic
'title' => '还款',
'desc' => '',
'total_money' => $amount,
'value' => $amount_value['y'],
'value' => $amount_value['y']??[],
'type' => 1,
];
return $data;

93
app/adminapi/logic/manage_basic/ManageStatisticsLogic.php Normal file
View File

@ -0,0 +1,93 @@
<?php
namespace app\adminapi\logic\manage_basic;
use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement;
use app\common\model\marketing\MarketingContract;
/**
* 项目管理--统计
* Class ManageStatisticsLogic
* @package app\adminapi\logic\manage_basic
*/
class ManageStatisticsLogic extends BaseLogic
{
public static function ManageStatistics($where, $time)
{
$data = [];
$datearr = explode('-', $time);
$time = TimeConvert(['start_time' => $datearr[0], 'end_time' => $datearr[1]]);
$marketingContract = new MarketingContract();
$consultProject = new ConsultProject();
$financialInvoice = new FinancialInvoice();
$financialRefund = new FinancialRefund();
$financialSettlement = new FinancialSettlement();
$where_1=[
['review_status', '=', 1],
['contract_type', '=', 0],
['business_nature', '=', 2],
['status', '=', 0]
];
$total_apply_amount = $marketingContract->statistics_count($where_1, $time, 'sum', '');
$apply_amount_value = $marketingContract->statistics_count($where_1, $time, 'group', 'create_time');
$data[] = [
'title' => '待立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$total_apply_amount = $consultProject->statistics_count([], $time, 'sum', '');
$apply_amount_value = $consultProject->statistics_count([], $time, 'group', 'create_time');
$data[] = [
'title' => '已立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$contract_ids = $consultProject->column('contract');
//开票金额
$where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
$apply_amount_value = $financialInvoice->ContractFinancialMoney($where, $time, 'group', 'create_time', 'apply_amount');
$data[] = [
'title' => '开票金额',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
//回款金额
$total_amount = $financialRefund->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialRefund->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '回款金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
//结算金额
$total_amount = $financialSettlement->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialSettlement->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '结算金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
return $data;
}
}

8
app/adminapi/logic/marketing/MarketingStatisticsLogic.php
View File

@ -26,7 +26,7 @@ class MarketingStatisticsLogic extends BaseLogic
'title' => '主合同',
'desc' => '',
'total_money' => $total_contract_type_0,
'value' => $total_contract_type_0_value['y'],
'value' => $total_contract_type_0_value['y']??[],
'type' => 1,
];
// //统计框架协议
@ -36,7 +36,7 @@ class MarketingStatisticsLogic extends BaseLogic
'title' => '框架协议',
'desc' => '',
'total_money' => $total_contract_type_1,
'value' => $total_contract_type_1_value['y'],
'value' => $total_contract_type_1_value['y']??[],
'type' => 1,
];
// //统计补充协议
@ -46,7 +46,7 @@ class MarketingStatisticsLogic extends BaseLogic
'title' => '补充协议',
'desc' => '',
'total_money' => $total_contract_type_2,
'value' => $total_contract_type_2_value['y'],
'value' => $total_contract_type_2_value['y']??[],
'type' => 1,
];
//统计客户
@ -67,7 +67,7 @@ class MarketingStatisticsLogic extends BaseLogic
'title' => $value,
'desc' => '',
'total_money' => $count,
'value' => $y_value['y'],
'value' => $y_value['y']??[],
'type' => 1,
];
}

81
app/adminapi/logic/supervision_project/SupervisionProjectStatisticsLogic.php Normal file
View File

@ -0,0 +1,81 @@
<?php
namespace app\adminapi\logic\supervision_project;
use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\dict\DictData;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\financial\FinancialSettlement;
use app\common\model\marketing\MarketingContract;
class SupervisionProjectStatisticsLogic extends BaseLogic
{
public static function consultStatistics($where, $time)
{
$data = [];
$datearr = explode('-', $time);
$time = TimeConvert(['start_time' => $datearr[0], 'end_time' => $datearr[1]]);
$marketingContract = new MarketingContract();
$consultProject = new ConsultProject();
$financialInvoice = new FinancialInvoice();
$financialRefund = new FinancialRefund();
$financialSettlement = new FinancialSettlement();
$total_apply_amount = $marketingContract->statistics_count([], $time, 'sum', '');
$apply_amount_value = $marketingContract->statistics_count([], $time, 'group', 'create_time');
$data[] = [
'title' => '待立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$total_apply_amount = $consultProject->statistics_count([], $time, 'sum', '');
$apply_amount_value = $consultProject->statistics_count([], $time, 'group', 'create_time');
$data[] = [
'title' => '已立项项目',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
$problem_cate = DictData::where('type_value', 'problem_cate')->column('name', 'value');
$contract_ids = $consultProject->column('contract');
//开票金额
$where[]=['contract_id','in',$contract_ids];
$total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
$apply_amount_value = $financialInvoice->ContractFinancialMoney($where, $time, 'group', 'create_time', 'apply_amount');
$data[] = [
'title' => '开票金额',
'desc' => '',
'total_money' => $total_apply_amount,
'value' => $apply_amount_value['y'] ?? 0,
'type' => 1,
];
//回款金额
$total_amount = $financialRefund->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialRefund->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '回款金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
//结算金额
$total_amount = $financialSettlement->statistics($where, $time, 'sum', '', 'amount');
$amount_value = $financialSettlement->statistics($where, $time, 'group', 'create_time', 'amount');
$data[] = [
'title' => '结算金额',
'desc' => '',
'total_money' => $total_amount,
'value' => $amount_value['y'] ?? 0,
'type' => 1,
];
return $data;
}
}

25
app/common/model/BaseModel.php
View File

@ -60,7 +60,7 @@ class BaseModel extends Model
return !empty($data['approve_check_status']) ? $dict[$data['approve_check_status']] : '待审核';
}
/**
* 统计
* 统计sum
*/
public function statistics($where, $time, string $selectType, string $group = "", $sum = '')
{
@ -82,6 +82,29 @@ class BaseModel extends Model
}
return $totalMoney;
}
/**
* 统计count
*/
public function statistics_count($where, $time, string $selectType, string $group = "",)
{
switch ($selectType) {
case "sum":
$totalMoney = $this->where($where)->when(isset($time), function ($query) use ($time) {
$query->whereBetweenTime('create_time', strtotime($time['start_time']), strtotime($time['end_time']));
})->count();
break;
case "group":
$totalMoney = $this->getCurveData($where, $time, "count(id)", $group);
break;
default:
throw new \Exception($this->name . ':selectType参数错误');
}
if ($group) {
$totalMoney = $this->trendYdata((array)$totalMoney, $time);
}
return $totalMoney;
}
/**
* 曲线统计
* @param $time