From dd7b5ca9c3ba905eed19134504278547ba5488cd Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 8 Feb 2023 10:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=87=E5=AE=9A=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CropYieldController.php | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php index e7af614..33ca639 100644 --- a/app/Http/Controllers/CropYieldController.php +++ b/app/Http/Controllers/CropYieldController.php @@ -9,6 +9,7 @@ use App\Http\Resources\CropYieldListResource; use App\Models\AgriculturalBase; use App\Models\Crop; use App\Models\CropYield; +use Peidikeji\Setting\Models\Setting; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Peidikeji\Keywords\Models\Keywords; @@ -241,6 +242,37 @@ class CropYieldController extends Controller if (isset($totalData[$category->id])) { $data[$category->name] = $totalData[$category->id]['output_total']; } + //如果是没有查指定城镇,则如果设置数据统计,则使用统计数值; + if(!($baseId > 0)){ + $settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray(); + switch($category->key){ + case 'crops-cate-nongye': + if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){ + $data[$category->name] = json_decode($settingCharts['city_data_chart_nongye'], true)[$year]; + } + break; + case 'crops-cate-yuye': + if(isset(json_decode($settingCharts['city_data_chart_yuye'], true)[$year])){ + $data[$category->name] = json_decode($settingCharts['city_data_chart_yuye'], true)[$year]; + } + break; + case 'crops-cate-xumuye': + if(isset(json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])){ + $data[$category->name] = json_decode($settingCharts['city_data_chart_xumuye'], true)[$year]; + } + break; + case 'crops-cate-lingye': + if(isset(json_decode($settingCharts['city_data_chart_lingye'], true)[$year])){ + $data[$category->name] = json_decode($settingCharts['city_data_chart_lingye'], true)[$year]; + } + break; + case 'crops-cate-activity': + if(isset(json_decode($settingCharts['city_data_chart_activity'], true)[$year])){ + $data[$category->name] = json_decode($settingCharts['city_data_chart_activity'], true)[$year]; + } + break; + } + } } return $this->json([