Browse Source

更新冲突

sandm 3 years ago
parent
commit
94ac0d7f8d
2 changed files with 7 additions and 5 deletions
  1. 5 5
      app/Admin/Controllers/Recruit/RecruitController.php
  2. 2 0
      app/Admin/routes.php

+ 5 - 5
app/Admin/Controllers/Recruit/RecruitController.php

@@ -620,11 +620,11 @@ class RecruitController extends Controller
 
 
 
 
         $list = RecruitAppointInfo::where($where)
         $list = RecruitAppointInfo::where($where)
-            ->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')
-            ->join('recruit_ticket', 'recruit_ticket.appoint_id', '=', 'recruit_appoint_info.id','left')
-            ->select('recruit_appoint_info.*', 'recruit_post.code', 'recruit_post.name')
-            ->orderBy('recruit_appoint_info.updated_at','desc')
-            ->paginate($perpage);
+                ->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')
+                ->join('recruit_ticket', 'recruit_ticket.appoint_id', '=', 'recruit_appoint_info.id','left')
+                ->select('recruit_appoint_info.*', 'recruit_post.code', 'recruit_post.name')
+                ->orderBy('recruit_appoint_info.updated_at','desc')
+                ->paginate($perpage);
 
 
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
             if($v->sex == 0){
             if($v->sex == 0){

+ 2 - 0
app/Admin/routes.php

@@ -440,6 +440,8 @@ Route::group([
         $router->get('out_zip', 'RecruitController@out_zip')->name('recruit.out_zip');
         $router->get('out_zip', 'RecruitController@out_zip')->name('recruit.out_zip');
         $router->get('out_excel', 'RecruitController@out_excel')->name('recruit.out_excel');
         $router->get('out_excel', 'RecruitController@out_excel')->name('recruit.out_excel');
         $router->post('appoint_audit', 'RecruitController@appoint_audit')->name('recruit.appoint_audit');
         $router->post('appoint_audit', 'RecruitController@appoint_audit')->name('recruit.appoint_audit');
+        $router->get('ajax_supplement', 'RecruitController@ajax_supplement')->name('recruit.ajax_supplement');
+        $router->post('supplement', 'RecruitController@supplement')->name('recruit.supplement');
         $router->post('modify_appoint_info', 'RecruitController@modify_appoint_info')->name('recruit.modify_appoint_info');
         $router->post('modify_appoint_info', 'RecruitController@modify_appoint_info')->name('recruit.modify_appoint_info');
         $router->get('seat_sticker', 'RecruitController@seat_sticker')->name('recruit.seat_sticker');
         $router->get('seat_sticker', 'RecruitController@seat_sticker')->name('recruit.seat_sticker');
         $router->get('sign_table', 'RecruitController@sign_table')->name('recruit.sign_table');
         $router->get('sign_table', 'RecruitController@sign_table')->name('recruit.sign_table');