From 408212d1a7390ed2a3e9bc6ce07f71012939b743 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 5 Jul 2024 10:50:42 +0800
Subject: [PATCH] Update: refactor code and improve statistics functions in
 ConsultStatisticsLogic, CostProjectStatisticsLogic, ManageStatisticsLogic,
 and SupervisionProjectStatisticsLogic

---
 app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php    | 3 +--
 app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php | 2 +-
 app/adminapi/logic/manage_basic/ManageStatisticsLogic.php      | 2 +-
 .../supervision_project/SupervisionProjectStatisticsLogic.php  | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php b/app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php
index 7655fad30..9df04a2c8 100644
--- a/app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php
+++ b/app/adminapi/logic/consult_basic/ConsultStatisticsLogic.php
@@ -21,7 +21,6 @@ class ConsultStatisticsLogic extends BaseLogic
         $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[] = [
@@ -42,7 +41,7 @@ class ConsultStatisticsLogic extends BaseLogic
         ];
 
 
-        $contract_ids = $consultProject->column('contract');
+        $contract_ids = $consultProject->group('contract')->column('contract');
         //开票金额
         $where[]=['contract_id','in',$contract_ids];
         $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
diff --git a/app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php b/app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php
index e5530b96d..919cf67dd 100644
--- a/app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php
+++ b/app/adminapi/logic/cost_project/CostProjectStatisticsLogic.php
@@ -81,7 +81,7 @@ class CostProjectStatisticsLogic extends BaseLogic
 			'value' => $apply_amount_value['y'] ?? 0,
 			'type' => 1,
 		];
-		$contract_ids = $CostProject->column('contract_id');
+        $contract_ids = $CostProject->group('contract_id')->column('contract_id');
 
 		$where[]=['contract_id','in',$contract_ids];
         $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
diff --git a/app/adminapi/logic/manage_basic/ManageStatisticsLogic.php b/app/adminapi/logic/manage_basic/ManageStatisticsLogic.php
index d1d419033..bd4844bc1 100644
--- a/app/adminapi/logic/manage_basic/ManageStatisticsLogic.php
+++ b/app/adminapi/logic/manage_basic/ManageStatisticsLogic.php
@@ -56,7 +56,7 @@ class ManageStatisticsLogic extends BaseLogic
             'type' => 1,
         ];
 
-        $contract_ids = $consultProject->column('contract');
+        $contract_ids = $consultProject->group('contract')->column('contract');
         //开票金额
         $where[]=['contract_id','in',$contract_ids];
         $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');
diff --git a/app/adminapi/logic/supervision_project/SupervisionProjectStatisticsLogic.php b/app/adminapi/logic/supervision_project/SupervisionProjectStatisticsLogic.php
index 65607ff9e..ce6f227a0 100644
--- a/app/adminapi/logic/supervision_project/SupervisionProjectStatisticsLogic.php
+++ b/app/adminapi/logic/supervision_project/SupervisionProjectStatisticsLogic.php
@@ -62,7 +62,8 @@ class SupervisionProjectStatisticsLogic extends BaseLogic
                 'type' => 1,
             ];
         }
-        $contract_ids = $supervisionProject->column('contract');
+        $contract_ids = $supervisionProject->group('contract')->column('contract');
+
         //开票金额
         $where[] = ['contract_id', 'in', $contract_ids];
         $total_apply_amount = $financialInvoice->ContractFinancialMoney($where, $time, 'sum', '', 'apply_amount');