From 8bc05198d1d257fbe4d3ff2cf75a7f3f6d91c4f3 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 15 Apr 2024 10:13:39 +0800
Subject: [PATCH] update

---
 .../MarketingBidStatisticsController.php      | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/app/adminapi/controller/marketing/MarketingBidStatisticsController.php b/app/adminapi/controller/marketing/MarketingBidStatisticsController.php
index 330f9655a..b87a998f6 100644
--- a/app/adminapi/controller/marketing/MarketingBidStatisticsController.php
+++ b/app/adminapi/controller/marketing/MarketingBidStatisticsController.php
@@ -60,55 +60,47 @@
 		//投标项目状态明细表
 		public function bid_project_status(): Json
 		{
-			$status = [0 => '未启动投标', 1 => '参与投标', 2 => '未开标', 3 => '已中标', 4 => '未中标'];
+			$column = [0 => '未启动投标', 1 => '参与投标', 2 => '未开标', 3 => '已中标', 4 => '未中标'];
 			$data = [];
-			foreach ($status as $k => $v) {
+			foreach ($column as $k => $v) {
 				$count = MarketingBusinessOpportunity::field('id')->where('status', $k)->count();
 				$data[] = [
 					'name' => $v,
 					'value' => $count
 				];
 			}
-			return $this->success('success', compact('status', 'data'));
+			return $this->success('success', compact('column', 'data'));
 		}
 		
 		//投标项目数量明细表
 		public function bid_project_number(): Json
 		{
 			$column = [0 => '未启动投标', 1 => '参与投标', 2 => '未开标', 3 => '已中标', 4 => '未中标'];
-			$series = [
-				'name' => '数量',
-				'data' => []
-			];
+			$data = [];
 			foreach ($column as $k => $v) {
-				$series['data'][] = MarketingBusinessOpportunity::field('id')->where('status', $k)->count();
+				$data[] = [
+					'name' => $v,
+					'value' => MarketingBusinessOpportunity::field('id')->where('status', $k)->count()
+				];
 			}
-			$result = [
-				'column' => $column,
-				'series' => $series
-			];
-			return $this->success('success', $result);
+			return $this->success('success', compact('column', 'data'));
 		}
 		
 		//投标项目分析
 		public function bid_project_analysis(): Json
 		{
 			$column = DictData::where('type_value', 'cost_consultation_business_nature')->column('name', 'value');
-			$series = [
-				'name' => '数量',
-				'data' => []
-			];
+			$data = [];
 			foreach ($column as $k => $v) {
 				$business_opportunity_ids = MarketingBusinessOpportunity::where('business_nature', $k)->column('id');
 				$bid_evaluation_ids = MarketingBidEvaluation::where('business_opportunity_id', 'in', $business_opportunity_ids)->column('id');
 				$bid_info_ids = MarketingBidInfo::where('bid_evaluation_id', 'in', $bid_evaluation_ids)->column('id');
-				$series['data'][] = MarketingBidResult::field('id')->where('bid_info_id', 'in', $bid_info_ids)->where('bid_result', 0)->count();
+				$data[] = [
+					'name' => $v,
+					'value' => MarketingBidResult::field('id')->where('bid_info_id', 'in', $bid_info_ids)->where('bid_result', 0)->count()
+				];
 			}
-			$result = [
-				'column' => $column,
-				'series' => $series
-			];
-			return $this->success('success', $result);
+			return $this->success('success', compact('column', 'data'));
 		}
 		
 		//行业投标分析