pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pdkj:dd7b5ca9c3ba905eed19134504278547ba5488cd
Branches Tags
pdkj:main
pdkj:dev
..
compare: pdkj:6b8c6984594dea98f15480151241e0f7be09427f
Branches Tags
pdkj:main
pdkj:dev

No commits in common. "dd7b5ca9c3ba905eed19134504278547ba5488cd" and "6b8c6984594dea98f15480151241e0f7be09427f" have entirely different histories.
dd7b5ca9c3 ... 6b8c698459

1 changed files with 0 additions and 34 deletions
Show Stats Expand all files Collapse all files

34
app/Http/Controllers/CropYieldController.php
View File

@ -9,7 +9,6 @@ use App\Http\Resources\CropYieldListResource;
use App\Models\AgriculturalBase; use App\Models\AgriculturalBase;
use App\Models\Crop; use App\Models\Crop;
use App\Models\CropYield; use App\Models\CropYield;
use Peidikeji\Setting\Models\Setting;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Peidikeji\Keywords\Models\Keywords; use Peidikeji\Keywords\Models\Keywords;
@ -242,37 +241,6 @@ class CropYieldController extends Controller
if (isset($totalData[$category->id])) { if (isset($totalData[$category->id])) {
$data[$category->name] = $totalData[$category->id]['output_total']; $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([ return $this->json([
@ -287,8 +255,6 @@ class CropYieldController extends Controller
{ {
$baseId = $request->input('base_id'); //镇 $baseId = $request->input('base_id'); //镇
$nowYear = date('Y'); $nowYear = date('Y');
//默认去年开始往前4年；
$nowYear--;
$q = CropYield::query(); $q = CropYield::query();
if ($baseId) { if ($baseId) {