|
|
@@ -136,20 +136,20 @@ class FarmCropController extends AdminController
|
|
|
|
|
|
// 添加产出相关过滤器
|
|
|
$filter->equal('final_output_item_id', '产出物品ID');
|
|
|
- $filter->where('final_output_amount', '产量状态', function ($query) {
|
|
|
+ $filter->where('output_status', function ($query) {
|
|
|
$value = $this->input;
|
|
|
if ($value == 'has_amount') {
|
|
|
$query->whereNotNull('final_output_amount');
|
|
|
} elseif ($value == 'no_amount') {
|
|
|
$query->whereNull('final_output_amount');
|
|
|
}
|
|
|
- })->select([
|
|
|
+ }, '产量状态')->select([
|
|
|
'has_amount' => '已确定产量',
|
|
|
'no_amount' => '未确定产量'
|
|
|
]);
|
|
|
|
|
|
// 添加数据完整性过滤器
|
|
|
- $filter->where('data_completeness', '数据完整性', function ($query) {
|
|
|
+ $filter->where('data_completeness', function ($query) {
|
|
|
$value = $this->input;
|
|
|
if ($value == 'complete') {
|
|
|
$query->whereNotNull('final_output_item_id')
|
|
|
@@ -165,7 +165,7 @@ class FarmCropController extends AdminController
|
|
|
$query->whereNotNull('final_output_item_id')
|
|
|
->whereNull('final_output_amount');
|
|
|
}
|
|
|
- })->select([
|
|
|
+ }, '数据完整性')->select([
|
|
|
'complete' => '数据完整(成熟期)',
|
|
|
'incomplete_mature' => '数据不完整(成熟期)',
|
|
|
'missing_amount' => '缺少产量'
|