Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1027,6 +1027,7 @@ class RecruitController extends Controller
         $type = $request->type;
         $view_data['ids'] = $ids;
         $info = RecruitSupplement::where('appoint_id',$ids)->where("type",$type)->first();
+        $view_data['type'] = $type;
         if(!$info){
             $view_data['switch'] = 0;
             $view_data['photos'] = [];
@@ -1358,6 +1359,7 @@ class RecruitController extends Controller
         if (empty($ids)) {
             return response()->json(['status' => 0, 'msg' => '请选择审核记录！'], '200');
         }
+        $type = $request->type;
         $status = $request->h_status;
         $reason = $request->reason;
         if(empty($status)){
@@ -1367,7 +1369,7 @@ class RecruitController extends Controller
             return response()->json(['status' => 0, 'msg' => '请输入审核原因！'], '200');
         }
         if($status == -1){
-            $info = RecruitSupplement::where('appoint_id', $ids)->first();
+            $info = RecruitSupplement::where('appoint_id', $ids)->where('type',$type)->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志
             $log = [
@@ -1387,7 +1389,7 @@ class RecruitController extends Controller
         }
         if($status == 1){
             $reason = $reason ?? '符合报考条件';
-            $info = RecruitSupplement::where('appoint_id', $ids)->first();
+            $info = RecruitSupplement::where('appoint_id', $ids)->where('type',$type)->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志
             $log = [

app/Http/Controllers/Web/Talent/JjhcController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Web\Talent;
 
 use App\Http\Controllers\Web\WebBaseController;
+use App\Models\RecruitAppointInfo;
 use App\Models\RecruitAppointSelect;
 use App\Models\RecruitPost;
 use App\Models\RecruitTicket;
@@ -58,80 +59,56 @@ class JjhcController extends WebBaseController
 //        if(!$quota){
 //            $quota = [
 //                [
-//                    'name' => '青阳街道',
-//                    'value' => 29,
-//                ],
-//                [
-//                    'name' => '梅岭街道',
-//                    'value' => 41
-//                ],
-//                [
-//                    'name' => '西园街道',
-//                    'value' => 16
-//                ],
-//                [
-//                    'name' => '罗山街道',
-//                    'value' => 30
-//                ],
-//                [
-//                    'name' => '灵源街道',
-//                    'value' => 18
-//                ],
-//                [
 //                    'name' => '新塘街道',
-//                    'value' => 29
+//                    'value' => 13
 //                ],
 //                [
 //                    'name' => '陈埭镇',
-//                    'value' => 112
+//                    'value' => 88
 //                ],
 //                [
 //                    'name' => '池店镇',
-//                    'value' => 80
+//                    'value' => 10
 //                ],
 //                [
 //                    'name' => '安海镇',
-//                    'value' => 86
+//                    'value' => 10
 //                ],
 //                [
 //                    'name' => '磁灶镇',
-//                    'value' => 46
+//                    'value' => 21
 //                ],
 //                [
 //                    'name' => '内坑镇',
-//                    'value' => 38
-//                ],
-//                [
-//                    'name' => '紫帽镇',
-//                    'value' => 9
+//                    'value' => 22
 //                ],
 //                [
 //                    'name' => '东石镇',
-//                    'value' => 29
+//                    'value' => 4
 //                ],
 //                [
 //                    'name' => '永和镇',
-//                    'value' => 43
+//                    'value' => 27
 //                ],
 //                [
 //                    'name' => '英林镇',
-//                    'value' => 25
+//                    'value' => 5
 //                ],
 //                [
 //                    'name' => '金井镇',
-//                    'value' => 28
+//                    'value' => 13
 //                ],
 //                [
 //                    'name' => '龙湖镇',
-//                    'value' => 63
+//                    'value' => 53
 //                ],
 //                [
 //                    'name' => '深沪镇',
-//                    'value' => 29
+//                    'value' => 23
 //                ],
 //                [
 //                    'name' => '西滨镇',
-//                    'value' => 9
+//                    'value' => 3
 //                ]
 //            ];
 //            $redis->set('recruit_quota',json_encode($quota));
@@ -194,8 +171,22 @@ class JjhcController extends WebBaseController
 //            RecruitAppointSelect::create($data);
 //
 //        }
-
-
+        $redis = Cache::getRedis();
+        $redis->set('recruit_quota',false);
+//        $list = DB::table("recruit_temp")->get();
+//        foreach ($list as $k => $v){
+//            $appoint_info = RecruitAppointInfo::where('card',$v->f3)->where('recruit_id',18)->first();
+//            $data = [
+//                'batch' => 2,
+//                'appoint_id' => $appoint_info->id,
+//                'recruit_id' => 18,
+//                'uid' => $appoint_info->uid,
+//                'record' => $v->f6,
+//                'status' => 0
+//            ];
+//
+//            RecruitAppointSelect::create($data);
+//        }
 
 
 //        for ($room = 1;$room <= 78; $room++){

public/themes/default/views/app/recruit/post_select.blade.php

@@ -185,8 +185,8 @@
             },
             methods: {
                 post: function() {
-                    if(this.select_list.length != 19){
-                        this.$message.error('请对19个镇（街道）进行排序！');
+                    if(this.select_list.length != 13){
+                        this.$message.error('请对13个镇（街道）进行排序！');
                         return false;
                     }
                     var msg = "您正在提交择岗的操作！";

public/themes/default/views/app/recruit/show.blade.php

@@ -99,6 +99,9 @@
                     <a href="{{ route('recruit.post_select',array('recruit_id'=>$recruit->id)) }}" >
                         <li style="background:#764DB3;float: left;margin-bottom:10px;">择岗</li>
                     </a>
+                    <a href="{{ route('recruit.supplement_info',array('id'=>$recruit->id)) }}" >
+                        <li style="background:#764DB3;float: left;margin-bottom:10px;">信息采集</li>
+                    </a>
                 @endif
                 <div style="clear: both;"></div>
             </ul>
@@ -654,6 +657,14 @@
                         return false;
                     }
 
+                    if(face_ticket == -2){
+                        disapperTooltip("remind", "健康信息未上传，即将自动跳转至上传界面！");
+                        setTimeout(function(){
+                            window.location.href="{!! route('recruit.health_info',array('id'=>$recruit->id,'type' => 'face')) !!}"
+                        },2000);
+                        return false;
+                    }
+
                     if (isVisitorutype == '1') {
                         disapperTooltip("remind", "只有登录个人会员才可打印！");
                         return false;

resources/views/admin/recruit/ajax_health.blade.php

@@ -26,6 +26,7 @@
         <form id="J_interviewWrap">
             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
             <input name="ids" type="hidden" value="{{$ids}}"/>
+            <input name="type" type="hidden" value="{{$type}}"/>
             <h1 style="text-align: center;line-height: 60px;">
                 健康信息审核
             </h1>

resources/views/admin/recruit/appoint_list.blade.php

@@ -396,6 +396,9 @@
                                                 @if($recruit->pen_health == 1)
                                                     <button class='btn btn-primary btn-xs health' data-param="{{$v->id}}" data-type="pen" style="margin-bottom: 10px">笔试健康信息审核</button>
                                                 @endif
+                                                @if($recruit->face_health == 1)
+                                                    <button class='btn btn-primary btn-xs health' data-param="{{$v->id}}" data-type="face" style="margin-bottom: 10px">面试健康信息审核</button>
+                                                @endif
                                                 @if($recruit->id == 5 || $recruit->id == 16 || $recruit->id == 18)
                                                     <button class='btn btn-primary btn-xs supplement' data-param="{{$v->id}}" style="margin-bottom: 10px">补登材料审核</button>
                                                 @endif
@@ -631,7 +634,7 @@
             $.getJSON("/ST3IXxKlOa4eGEv0eTw0CfORI9444Mgj/recruit/ajax_health", {
                 recruit_id: recruit_id,
                 ids: ids,
-                type: 'pen'
+                type: type
             }, function(result) {
                 if (result.status == 1) {
                     qsDialog.setContent(result.data);

routes/web.php

@@ -120,6 +120,8 @@ Route::group([
     $router->get('select_result','Web\Recruit\IndexController@select_result')->name('recruit.select_result');
     $router->post('get_select_result','Web\Recruit\IndexController@get_select_result')->name('recruit.get_select_result');
     $router->post('select_init','Web\Recruit\IndexController@select_init')->name('recruit.select_init');
+    $router->get('supplement_info','Web\Recruit\IndexController@supplement_info')->name('recruit.supplement_info');
+    $router->post('save_supplement_info','Web\Recruit\IndexController@save_supplement_info')->name('recruit.save_supplement_info');
 
     $router->any('/{route?}', function () {
         return view('recruit');