增加卫健字段

app/Admin/Controllers/Company/CompanyController.php

@@ -352,6 +352,8 @@ class CompanyController extends Controller
                     }
                     $filter->equal('companyConsultant.consultant_id', '顾问')->select($arr_con);
                 }
+
+                $filter->equal('is_health', '卫健系统')->select(['1'=>'是', '2'=>'否']);
             });
         });
         if (Admin::user()->can('company_manager_create')) {
@@ -584,6 +586,7 @@ EOT;
             //企业性质给定数组
             $com_type = Category::categoryType('AIX_company_type');
             $form->radio('nature', '企业性质')->options($com_type)->default(key($com_type))->setMustMark();
+            $form->radio('is_health', '卫健系统')->options([1 => '是', 2 => '否'])->default(2);
             $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);
             $form->select('trade', '所属行业')->options(Category::categoryType('AIX_trade'))->setWidth(3)->rules('required', ['required' => '请选择相应的企业所属行业'])->setMustMark();
             $form->select('province', '所属省份')->options(CategoryDistrict::List()->pluck('name', 'id'))->setWidth(3)->load('city', admin_base_path("/sys/category/categoryDis"))->rules('required', ['required' => '请选择相应的企业所属省份'])->setMustMark();
@@ -825,7 +828,8 @@ EOT;
             //企业性质给定数组
             $nature = Category::categoryType('AIX_company_type');
             $form->radio('nature', '企业性质')->options($nature)->default(key($nature))->rules(['required'], ['required' => '请选择相应的企业性质'])->setMustMark();
-            $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);;
+            $form->radio('is_health', '卫健系统')->options([1 => '是', 2 => '否'])->default(2);
+            $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);
             $form->select('trade', '所属行业')->options(Category::categoryType('AIX_trade'))->setWidth(3)->rules('required', ['required' => '请选择相应的企业所属行业'])->setMustMark();
             //单位性质
 //            $unit_character = Category::categoryType('AIX_company_type');

app/Admin/Controllers/Company/JobsController.php

@@ -261,6 +261,7 @@ ETO;
                     }
                 }, '推广类型', 'promotion')->select([0 => '不限', 1 => '未推广', 2 => '置顶', 3 => '紧急'])->default('0');
                 $filter->equal('valid', '有效状态')->select(['0'=>'无效职位', '1'=>'有效职位']);
+                $filter->equal('is_health', '卫健系统')->select(['1'=>'是', '2'=>'否']);
             });
             $filter->column(1/2, function ($filter) {
                 $filter->equal('id', '职位ID');
@@ -570,8 +571,9 @@ ETO;
                 $experience['0']="不限";
                 $form->radio('experience', '工作经验')->options($experience);
                 $form->radio('sex', '性别要求')->options([0=>'不限',1=>'男',2=>'女']);
-                $form->radio('is_deformity', '是否接受残疾人')->options([1=>'是',2=>'否']);
-                $form->radio('is_soldier', '是否接受退役军人')->options([1=>'是',2=>'否']);
+                $form->radio('is_health', '卫健系统')->options([1=>'是',2=>'否'])->default(2);
+                $form->radio('is_deformity', '是否接受残疾人')->options([1=>'是',2=>'否'])->default(2);
+                $form->radio('is_soldier', '是否接受退役军人')->options([1=>'是',2=>'否'])->default(2);
 
                 $form->number('min_age', '最低年龄')->default(isset($jobsData['age'][0])?$jobsData['age'][0]:'')->min(16)->max(65)->help('最低年龄不能低于国家规定用工年龄');
                 $form->number('max_age', '最高年龄')->default(isset($jobsData['age'][1])?$jobsData['age'][1]:'')->min(16)->max(65)->help('最高年龄不能高于65周岁');

app/Http/Controllers/Mobile/Content/JobsController.php

@@ -179,9 +179,10 @@ class JobsController extends MobileBaseController
                 $show_login_notice = 1;
                 $list_limit = config('aix.companyset.search_com.search_basic.jobs_search_num_login');
             }
-
+            $where[] = ['is_health','=',1];
             $size = 20;
             $list = $this->searchService->search('Job', $where, $order_by, $search_key, $size);
+            dd($list);
             if ($list->total()>0) {
                 $list_items = $this->jobsService->dealjobFilelds($list->items(), $map_data);
             } else {

app/Services/Common/SearchService.php

@@ -748,6 +748,7 @@ class SearchService
                             } elseif ($v[1] == 'like') {
                                 $list->where($v[0], $v[2]);
                             }
+
                         }
 
                     } else {
@@ -760,8 +761,12 @@ class SearchService
                         } elseif ($v[0] == 'range') {
                             $map_filter['distance'] = $v[2] . 'km';
                         } else {
+                            if ($v[0] == 'is_health') {
+//                                dd($v);
+                            }
                             $list->where($v[0], $v[2]);
                         }
+
                     }
                 }