From 9388b47113f5ba66ab17fc31ca6e99c1074c8504 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 7 Mar 2023 17:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9D=A2=E6=9D=BF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CropYieldController.php | 28 +++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php
index 81ba5e4..6ee7597 100644
--- a/app/Http/Controllers/CropYieldController.php
+++ b/app/Http/Controllers/CropYieldController.php
@@ -237,6 +237,10 @@ class CropYieldController extends Controller
         $categories = Keywords::filter($request->all())->where('type_key', 'crops-category')->get();
 
         $data = [];
+        $settingCharts = [];
+        if(!($baseId > 0)){
+            $settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
+        }
         foreach ($categories as $category) {
             $data[$category->name] = 0;
             if (isset($totalData[$category->id])) {
@@ -244,7 +248,7 @@ class CropYieldController extends Controller
             }
             //如果是没有查指定城镇，则如果设置数据统计，则使用统计数值；
             if(!($baseId > 0)){
-                $settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
+                $data[$category->name] = 0;
                 switch($category->key){
                     case 'crops-cate-nongye':
                         if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){
@@ -302,12 +306,34 @@ class CropYieldController extends Controller
                     ->keyBy('time_year')->toArray();
 
         $data = [];
+        $settingCharts = [];
+        if(!($baseId > 0)){
+            $settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
+        }
         for ($i = 0; $i < 4; $i++) {
             $_year = $nowYear - $i;
             $data[$_year] = 0;
             if (isset($totalData[$_year])) {
                 $data[$_year] = $totalData[$_year]['output_total'];
             }
+            if(!($baseId > 0)){
+                $data[$_year] = 0;
+                if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){
+                    $data[$_year] += (json_decode($settingCharts['city_data_chart_nongye'], true)[$year])*10000;
+                }
+                if(isset(json_decode($settingCharts['city_data_chart_yuye'], true)[$year])){
+                    $data[$_year] += (json_decode($settingCharts['city_data_chart_yuye'], true)[$year])*10000;
+                }
+                if(isset(json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])){
+                    $data[$_year] += (json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])*10000;
+                }
+                if(isset(json_decode($settingCharts['city_data_chart_lingye'], true)[$year])){
+                    $data[$_year] += (json_decode($settingCharts['city_data_chart_lingye'], true)[$year])*10000;
+                }
+                if(isset(json_decode($settingCharts['city_data_chart_activity'], true)[$year])){
+                    $data[$_year] += (json_decode($settingCharts['city_data_chart_activity'], true)[$year])*10000;
+                }
+            }
         }
 
         return $this->json([