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

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1942,21 +1942,26 @@ class IndexController extends WebBaseController
 
     public function post_select(Request $request)
     {
-//        $user = $this->getUser();
-//        if (!empty($user)) {
-//            $uid = $user->id;
-//        } else {
-//            return redirect(route('login'));
-//        }
-//
-//        $recruit_id = $request->input('recruit_id');
-//        $appoint_id = $request->input('appoint_id');
-//
-//        $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
-//
-//        if(!$info){
-//            return $this->showMessage('抱歉，您无需择岗！', route('recruit.show',array('id',$recruit_id)), true, '上一页', '2');
-//        }
+        $user = $this->getUser();
+        if (!empty($user)) {
+            $uid = $user->id;
+        } else {
+            return redirect(route('login'));
+        }
+
+        $recruit_id = $request->input('recruit_id');
+        //$appoint_id = $request->input('appoint_id');
+
+        $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->first();
+
+        if(!$info){
+            return $this->showMessage('抱歉，您无需择岗！', route('recruit.show',array('id',$recruit_id)), true, '上一页', '2');
+        }
+        //手动设置择岗时间段
+        $time = time();
+        if($time > 1661247000 || $time < 1661126400){
+            return $this->showMessage('抱歉，未到择岗时间！', route('recruit.show',array('id',$recruit_id)), true, '上一页', '2');
+        }
         $option_list = [
             [
                 'id' => 1,
@@ -2035,27 +2040,37 @@ class IndexController extends WebBaseController
                 'name' => '西滨镇'
             ]
         ];
+
         $select_list = [];
-        $recruit_id = $request->input('recruit_id');
-        $appoint_id = $request->input('appoint_id');
-        $uid = $request->input('uid');
-        $info = RecruitAppointSelect::where('uid',$uid)->first();
-        if(!$info){
-            $info = new \stdClass();
-            $info->status = 0;
-            $info->recruit_id = 8;
-            $info->appoint_id = rand(0,999999);
-            $info->uid = rand(0,999999);
-        }else{
+        if($info->result){
             $result = json_decode($info->result,true);
-            foreach ($option_list as $k => $v){
-                if(in_array($v['name'],$result)){
-                    $select_list[$k] = $v;
-                    unset($option_list[$k]);
-                }
+
+            foreach ($result as $v){
+                $item['name'] = $v;
+                array_push($select_list,$item);
             }
         }
 
+//        $recruit_id = $request->input('recruit_id');
+//        $appoint_id = $request->input('appoint_id');
+//        $uid = $request->input('uid');
+//        $info = RecruitAppointSelect::where('uid',$uid)->first();
+//        if(!$info){
+//            $info = new \stdClass();
+//            $info->status = 0;
+//            $info->recruit_id = 8;
+//            $info->appoint_id = rand(0,999999);
+//            $info->uid = rand(0,999999);
+//        }else{
+//            $result = json_decode($info->result,true);
+//            foreach ($option_list as $k => $v){
+//                if(in_array($v['name'],$result)){
+//                    $select_list[$k] = $v;
+//                    unset($option_list[$k]);
+//                }
+//            }
+//        }
+
         $view_data = ['info' => $info,'options_list' => json_encode($option_list),'select_list' => json_encode($select_list)];
         return view('app.recruit.post_select',$view_data);
     }
@@ -2068,15 +2083,15 @@ class IndexController extends WebBaseController
     public function give_up_post(Request $request)
     {
         //以下为测试环境
-        $recruit_id = $request->input('recruit_id');
-        $appoint_id = $request->input('appoint_id');
-        $uid = $request->input('uid');
-        $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
-        if($info){
-            return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
-        }
-        RecruitAppointSelect::create(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id,'uid'=>$uid,'status'=>-1]);
-        return ['status' => 1, 'msg' => "放弃择岗成功！"];
+//        $recruit_id = $request->input('recruit_id');
+//        $appoint_id = $request->input('appoint_id');
+//        $uid = $request->input('uid');
+//        $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
+//        if($info){
+//            return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
+//        }
+//        RecruitAppointSelect::create(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id,'uid'=>$uid,'status'=>-1]);
+//        return ['status' => 1, 'msg' => "放弃择岗成功！"];
 
 
         //以下为正式环境再放开
@@ -2109,20 +2124,25 @@ class IndexController extends WebBaseController
 
     public function comfirm_post(Request $request)
     {
-        //以下为测试环境
+        $user = $this->getUser();
+        if (!empty($user)) {
+            $uid = $user->id;
+        } else {
+            return redirect(route('login'));
+        }
+
         $recruit_id = $request->input('recruit_id');
         $appoint_id = $request->input('appoint_id');
-        $uid = $request->input('uid');
         $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
-        if($info){
-            return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
-        }
-        $data = [
-            'recruit_id' => $recruit_id,
-            'appoint_id' => $recruit_id,
-            'uid' => $uid,
-            'status' => 1
-        ];
+        if($info->result){
+            return ['status' => 0, 'msg' => "择岗数据已提交！"];
+        }
+//        $data = [
+//            'recruit_id' => $recruit_id,
+//            'appoint_id' => $recruit_id,
+//            'uid' => $uid,
+//            'status' => 1
+//        ];
         $result = [];
         $select = $request->input('select');
         if(is_array($select) && count($select) > 0){
@@ -2130,8 +2150,9 @@ class IndexController extends WebBaseController
                 array_push($result,$v['name']);
             }
         }
-        $data['result'] = json_encode($result);
-        RecruitAppointSelect::create($data);
+        $info->result = json_encode($result);
+        $info->status = 1;
+        $info->save();
 
         return ['status' => 1, 'msg' => "提交择岗意愿成功，请耐心等待结果！"];
     }
@@ -2151,63 +2172,63 @@ class IndexController extends WebBaseController
             $quota = [
                 [
                     'name' => '青阳街道',
-                    'value' => 50,
+                    'value' => 29,
                 ],
                 [
                     'name' => '梅岭街道',
-                    'value' => 55
+                    'value' => 41
                 ],
                 [
                     'name' => '西园街道',
-                    'value' => 41
+                    'value' => 16
                 ],
                 [
                     'name' => '罗山街道',
-                    'value' => 33
+                    'value' => 30
                 ],
                 [
                     'name' => '灵源街道',
-                    'value' => 39
+                    'value' => 18
                 ],
                 [
                     'name' => '新塘街道',
-                    'value' => 52
+                    'value' => 29
                 ],
                 [
                     'name' => '陈埭镇',
-                    'value' => 77
+                    'value' => 112
                 ],
                 [
                     'name' => '池店镇',
-                    'value' => 82
+                    'value' => 80
                 ],
                 [
                     'name' => '安海镇',
-                    'value' => 64
+                    'value' => 86
                 ],
                 [
                     'name' => '磁灶镇',
-                    'value' => 36
+                    'value' => 46
                 ],
                 [
                     'name' => '内坑镇',
-                    'value' => 30
+                    'value' => 38
                 ],
                 [
                     'name' => '紫帽镇',
-                    'value' => 22
+                    'value' => 9
                 ],
                 [
                     'name' => '东石镇',
-                    'value' =>35
+                    'value' => 29
                 ],
                 [
                     'name' => '永和镇',
-                    'value' => 30
+                    'value' => 43
                 ],
                 [
                     'name' => '英林镇',
-                    'value' => 26
+                    'value' => 25
                 ],
                 [
                     'name' => '金井镇',
@@ -2215,15 +2236,15 @@ class IndexController extends WebBaseController
                 ],
                 [
                     'name' => '龙湖镇',
-                    'value' => 37
+                    'value' => 63
                 ],
                 [
                     'name' => '深沪镇',
-                    'value' => 23
+                    'value' => 29
                 ],
                 [
                     'name' => '西滨镇',
-                    'value' => 12
+                    'value' => 9
                 ]
             ];
             $redis->set('recruit_quota',json_encode($quota));
@@ -2278,63 +2299,63 @@ class IndexController extends WebBaseController
             $quota = [
                 [
                     'name' => '青阳街道',
-                    'value' => 50,
+                    'value' => 29,
                 ],
                 [
                     'name' => '梅岭街道',
-                    'value' => 55
+                    'value' => 41
                 ],
                 [
                     'name' => '西园街道',
-                    'value' => 41
+                    'value' => 16
                 ],
                 [
                     'name' => '罗山街道',
-                    'value' => 33
+                    'value' => 30
                 ],
                 [
                     'name' => '灵源街道',
-                    'value' => 39
+                    'value' => 18
                 ],
                 [
                     'name' => '新塘街道',
-                    'value' => 52
+                    'value' => 29
                 ],
                 [
                     'name' => '陈埭镇',
-                    'value' => 77
+                    'value' => 112
                 ],
                 [
                     'name' => '池店镇',
-                    'value' => 82
+                    'value' => 80
                 ],
                 [
                     'name' => '安海镇',
-                    'value' => 64
+                    'value' => 86
                 ],
                 [
                     'name' => '磁灶镇',
-                    'value' => 36
+                    'value' => 46
                 ],
                 [
                     'name' => '内坑镇',
-                    'value' => 30
+                    'value' => 38
                 ],
                 [
                     'name' => '紫帽镇',
-                    'value' => 22
+                    'value' => 9
                 ],
                 [
                     'name' => '东石镇',
-                    'value' =>35
+                    'value' => 29
                 ],
                 [
                     'name' => '永和镇',
-                    'value' => 30
+                    'value' => 43
                 ],
                 [
                     'name' => '英林镇',
-                    'value' => 26
+                    'value' => 25
                 ],
                 [
                     'name' => '金井镇',
@@ -2342,15 +2363,15 @@ class IndexController extends WebBaseController
                 ],
                 [
                     'name' => '龙湖镇',
-                    'value' => 37
+                    'value' => 63
                 ],
                 [
                     'name' => '深沪镇',
-                    'value' => 23
+                    'value' => 29
                 ],
                 [
                     'name' => '西滨镇',
-                    'value' => 12
+                    'value' => 9
                 ]
             ];
             $redis->set('recruit_quota',json_encode($quota));

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

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\Web\Talent;
 use App\Http\Controllers\Web\WebBaseController;
 use App\Models\RecruitAppointSelect;
 use App\Models\RecruitPost;
+use App\Models\RecruitTicket;
 use App\Services\Common\SmsService;
+use Illuminate\Support\Facades\Cache;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
@@ -50,37 +52,1101 @@ class JjhcController extends WebBaseController
         if($keyword != "j0vOW5mBREZxdo3P"){
             throw new ResponseException("who are you?", [], 404);
         }
-        $option_list = [
-            '青阳街道','梅岭街道','西园街道','罗山街道','灵源街道','新塘街道','陈埭镇','池店镇','安海镇','磁灶镇','内坑镇','紫帽镇','东石镇','永和镇','英林镇','金井镇','龙湖镇','深沪镇','西滨镇'
-        ];
-        $list = DB::table("recruit_appoint_info")->where('recruit_id',18)->where('audit',3)->where('pen_audit',1)->where('post_id',309)->get();
+        $str = "202201012011516
+202201012010129
+202201012011708
+202201012010229
+202201012010511
+202201012010212
+202201012013802
+202201012012804
+202201012010411
+202201012011916
+202201012010324
+202201012013518
+202201012010818
+202201012012801
+202201012011729
+202201012014126
+202201012012116
+202201012014614
+202201012011616
+202201012011017
+202201012014618
+202201012014309
+202201012010708
+202201012014612
+202201012010419
+202201012012625
+202201012011025
+202201012012018
+202201012011503
+202201012013701
+202201012014317
+202201012011109
+202201012013418
+202201012014723
+202201012012521
+202201012013530
+202201012013720
+202201012012321
+202201012010315
+202201012012405
+202201012014503
+202201012012313
+202201012014730
+202201012011113
+202201012011203
+202201012010902
+202201012013318
+202201012012019
+202201012012004
+202201012010728
+202201012010809
+202201012014916
+202201012014218
+202201012012328
+202201012010203
+202201012013926
+202201012014701
+202201012013413
+202201012012630
+202201012014111
+202201012013509
+202201012014625
+202201012012901
+202201012010925
+202201012012604
+202201012014515
+202201012010119
+202201012014629
+202201012012530
+202201012013003
+202201012012211
+202201012011507
+202201012011701
+202201012011730
+202201012011905
+202201012011415
+202201012015025
+202201012014113
+202201012013712
+202201012011228
+202201012014127
+202201012014215
+202201012010823
+202201012010209
+202201012012219
+202201012012612
+202201012011818
+202201012012622
+202201012013227
+202201012013127
+202201012013706
+202201012010808
+202201012011607
+202201012013104
+202201012013214
+202201012012029
+202201012013611
+202201012010605
+202201012013407
+202201012012519
+202201012015026
+202201012010819
+202201012014721
+202201012013005
+202201012013901
+202201012014926
+202201012012203
+202201012012416
+202201012012618
+202201012010920
+202201012013426
+202201012011711
+202201012012508
+202201012011919
+202201012010214
+202201012011318
+202201012010524
+202201012013816
+202201012014424
+202201012014607
+202201012011926
+202201012012620
+202201012011404
+202201012012012
+202201012010801
+202201012014803
+202201012012217
+202201012013911
+202201012014102
+202201012010225
+202201012011427
+202201012012210
+202201012011322
+202201012013305
+202201012014314
+202201012011012
+202201012010713
+202201012012629
+202201012011702
+202201012011225
+202201012011309
+202201012011014
+202201012013219
+202201012010929
+202201012010115
+202201012014402
+202201012013520
+202201012014711
+202201012010917
+202201012010903
+202201012013607
+202201012011016
+202201012013015
+202201012010516
+202201012011011
+202201012010924
+202201012013008
+202201012011222
+202201012011713
+202201012013908
+202201012011126
+202201012010410
+202201012014414
+202201012013619
+202201012011422
+202201012010506
+202201012014012
+202201012011724
+202201012014702
+202201012010615
+202201012013630
+202201012012714
+202201012012427
+202201012014227
+202201012012510
+202201012013514
+202201012013522
+202201012010709
+202201012010720
+202201012011403
+202201012013810
+202201012012514
+202201012010718
+202201012011512
+202201012011301
+202201012010730
+202201012010326
+202201012014313
+202201012010127
+202201012013625
+202201012013814
+202201012013915
+202201012011227
+202201012013512
+202201012013309
+202201012011922
+202201012014019
+202201012012726
+202201012011320
+202201012011015
+202201012011913
+202201012013012
+202201012012208
+202201012010919
+202201012010522
+202201012012606
+202201012012206
+202201012013715
+202201012011429
+202201012011305
+202201012012614
+202201012011828
+202201012012602
+202201012014525
+202201012011217
+202201012012915
+202201012014528
+202201012012501
+202201012011220
+202201012013824
+202201012012015
+202201012014024
+202201012014213
+202201012012409
+202201012013618
+202201012013705
+202201012013913
+202201012010208
+202201012013714
+202201012012817
+202201012011409
+202201012015108
+202201012013306
+202201012010428
+202201012011620
+202201012012202
+202201012013710
+202201012013408
+202201012012011
+202201012012511
+202201012015019
+202201012010328
+202201012014216
+202201012012415
+202201012010109
+202201012013529
+202201012011130
+202201012012125
+202201012011211
+202201012010813
+202201012014129
+202201012014805
+202201012014917
+202201012013628
+202201012011824
+202201012011510
+202201012013506
+202201012010112
+202201012010223
+202201012011105
+202201012012310
+202201012010916
+202201012014505
+202201012014508
+202201012013325
+202201012011005
+202201012012928
+202201012013919
+202201012010122
+202201012012220
+202201012010308
+202201012010519
+202201012011602
+202201012012827
+202201012011423
+202201012012722
+202201012010317
+202201012010124
+202201012013007
+202201012011621
+202201012010305
+202201012010826
+202201012010211
+202201012013212
+202201012011714
+202201012015115
+202201012011408
+202201012010102
+202201012011722
+202201012013803
+202201012013412
+202201012012522
+202201012011721
+202201012010613
+202201012012129
+202201012013216
+202201012014526
+202201012011608
+202201012010621
+202201012013709
+202201012010113
+202201012013921
+202201012012115
+202201012011328
+202201012013808
+202201012010907
+202201012013902
+202201012014324
+202201012013019
+202201012011615
+202201012011906
+202201012011108
+202201012012317
+202201012011718
+202201012012728
+202201012012315
+202201012013801
+202201012011303
+202201012010423
+202201012010128
+202201012011230
+202201012013302
+202201012010307
+202201012011716
+202201012012421
+202201012012716
+202201012014130
+202201012012829
+202201012012925
+202201012012112
+202201012011618
+202201012013228
+202201012012330
+202201012013327
+202201012012426
+202201012010412
+202201012010505
+202201012011925
+202201012013117
+202201012012711
+202201012012105
+202201012014305
+202201012011419
+202201012013728
+202201012011402
+202201012010729
+202201012014413
+202201012013601
+202201012014422
+202201012010403
+202201012015109
+202201012011827
+202201012011521
+202201012012102
+202201012012226
+202201012014123
+202201012010323
+202201012015029
+202201012013704
+202201012012826
+202201012011418
+202201012014029
+202201012014104
+202201012013120
+202201012013819
+202201012011514
+202201012013920
+202201012014527
+202201012015021
+202201012010301
+202201012014303
+202201012013527
+202201012014122
+202201012012615
+202201012012014
+202201012014109
+202201012014230
+202201012011028
+202201012013021
+202201012011216
+202201012014623
+202201012012425
+202201012012619
+202201012012126
+202201012013330
+202201012012020
+202201012013612
+202201012013220
+202201012011501
+202201012013304
+202201012014223
+202201012010616
+202201012010817
+202201012010407
+202201012012828
+202201012014322
+202201012012025
+202201012010607
+202201012011201
+202201012013605
+202201012012708
+202201012012808
+202201012014719
+202201012014504
+202201012010219
+202201012015101
+202201012010430
+202201012011821
+202201012011007
+202201012010706
+202201012012221
+202201012014722
+202201012011312
+202201012010909
+202201012013606
+202201012010629
+202201012012130
+202201012013719
+202201012010427
+202201012014105
+202201012011314
+202201012014329
+202201012012929
+202201012011705
+202201012010404
+202201012010530
+202201012011013
+202201012012701
+202201012014819
+202201012013102
+202201012011125
+202201012013602
+202201012014405
+202201012010416
+202201012012504
+202201012013504
+202201012012523
+202201012010126
+202201012012812
+202201012014417
+202201012012204
+202201012011304
+202201012013415
+202201012013004
+202201012011528
+202201012013918
+202201012012616
+202201012011218
+202201012013621
+202201012011810
+202201012011119
+202201012012706
+202201012015120
+202201012015010
+202201012013608
+202201012012905
+202201012010727
+202201012010429
+202201012015103
+202201012014018
+202201012011122
+202201012015110
+202201012012723
+202201012011806
+202201012010425
+202201012013507
+202201012011912
+202201012013416
+202201012013524
+202201012010316
+202201012010906
+202201012011610
+202201012012502
+202201012012717
+202201012014206
+202201012010510
+202201012011612
+202201012015113
+202201012014220
+202201012014810
+202201012011425
+202201012012429";
+        $record_str = "83.9
+82.1
+81.7
+81.5
+81.4
+80.4
+79.3
+79
+78.8
+78.4
+78
+77.8
+77.1
+76.9
+76.7
+76.6
+76.5
+76.4
+76.2
+76.1
+76
+75.9
+75.8
+75.8
+75.7
+75.4
+75.2
+75.1
+75
+74.9
+74.8
+74.2
+74.1
+73.9
+73.8
+73.8
+73.8
+73.7
+73.5
+73.3
+73.1
+73
+73
+72.7
+72.7
+72.6
+72.5
+72.5
+72.4
+72.3
+72.3
+72.2
+72.2
+72.2
+72.1
+71.9
+71.9
+71.9
+71.8
+71.1
+71.1
+71
+71
+71
+70.9
+70.9
+70.8
+70.6
+70.6
+70.5
+70.4
+70.4
+70.3
+70.3
+70.2
+70.2
+70.1
+70.1
+70.1
+69.9
+69.6
+69.5
+69.4
+69.3
+69.3
+69.2
+69.2
+69.1
+69.1
+69
+69
+69
+68.9
+68.9
+68.9
+68.8
+68.7
+68.6
+68.6
+68.5
+68.5
+68.5
+68.5
+68.4
+68.4
+68.3
+68.3
+68.3
+68.2
+68.1
+68
+68
+67.9
+67.9
+67.8
+67.6
+67.5
+67.5
+67.1
+67.1
+67.1
+67
+67
+66.9
+66.9
+66.9
+66.7
+66.7
+66.6
+66.6
+66.6
+66.5
+66.5
+66.5
+66.5
+66.4
+66.4
+66.3
+66.3
+66.3
+66.3
+66.2
+66.2
+66.2
+66.1
+66.1
+66
+66
+65.8
+65.7
+65.6
+65.5
+65.5
+65.3
+65.1
+65.1
+65
+65
+65
+65
+64.9
+64.9
+64.8
+64.8
+64.8
+64.7
+64.5
+64.5
+64.4
+64.3
+64.3
+64.3
+64.3
+64.2
+64.1
+64.1
+64.1
+64.1
+64.1
+64.1
+64
+63.9
+63.9
+63.8
+63.8
+63.8
+63.8
+63.8
+63.7
+63.7
+63.7
+63.7
+63.6
+63.5
+63.5
+63.5
+63.4
+63.4
+63.4
+63.3
+63.3
+63.2
+63.2
+63.2
+63.1
+63.1
+63.1
+63.1
+63.1
+63
+62.9
+62.9
+62.8
+62.8
+62.8
+62.8
+62.7
+62.7
+62.6
+62.6
+62.5
+62.5
+62.5
+62.5
+62.4
+62.3
+62.3
+62.2
+62.2
+62.2
+62.2
+62.1
+62.1
+62.1
+62
+62
+62
+62
+61.9
+61.9
+61.9
+61.9
+61.9
+61.9
+61.8
+61.8
+61.8
+61.8
+61.8
+61.8
+61.7
+61.7
+61.6
+61.6
+61.6
+61.5
+61.5
+61.5
+61.5
+61.4
+61.4
+61.4
+61.3
+61.3
+61.3
+61.3
+61.3
+61.2
+61.2
+61.2
+61.2
+61.1
+61
+61
+61
+60.9
+60.9
+60.8
+60.7
+60.7
+60.7
+60.7
+60.6
+60.6
+60.6
+60.6
+60.6
+60.5
+60.5
+60.5
+60.5
+60.4
+60.4
+60.3
+60.3
+60.3
+60.2
+60.1
+60.1
+60.1
+60
+59.9
+59.9
+59.9
+59.9
+59.9
+59.9
+59.9
+59.8
+59.8
+59.8
+59.7
+59.6
+59.5
+59.5
+59.5
+59.5
+59.5
+59.4
+59.3
+59.3
+59.2
+59.1
+59.1
+59.1
+58.8
+58.8
+58.8
+58.8
+58.7
+58.7
+58.7
+58.7
+58.7
+58.7
+58.6
+58.6
+58.6
+58.5
+58.5
+58.4
+58.4
+58.4
+58.3
+58.3
+58.2
+58.1
+58.1
+58
+58
+57.9
+57.9
+57.8
+57.8
+57.8
+57.7
+57.7
+57.6
+57.5
+57.5
+57.5
+57.4
+57.4
+57.4
+57.4
+57.3
+57.3
+57.3
+57.3
+57.3
+57.3
+57.2
+57.2
+57.1
+57
+57
+57
+56.9
+56.9
+56.9
+56.9
+56.9
+56.8
+56.8
+56.8
+56.7
+56.7
+56.7
+56.7
+56.6
+56.6
+56.5
+56.5
+56.5
+56.5
+56.5
+56.4
+56.3
+56.3
+56.3
+56.3
+56.3
+56.3
+56.2
+56.1
+56.1
+56.1
+56
+56
+55.9
+55.9
+55.9
+55.8
+55.8
+55.7
+55.6
+55.6
+55.6
+55.6
+55.5
+55.5
+55.5
+55.4
+55.4
+55.4
+55.3
+55.2
+55.2
+55.2
+55.1
+55.1
+55.1
+55.1
+55
+55
+54.9
+54.8
+54.8
+54.8
+54.7
+54.7
+54.7
+54.7
+54.6
+54.6
+54.5
+54.5
+54.5
+54.5
+54.5
+54.4
+54.4
+54.4
+54.3
+54.3
+54.3
+54.2
+54.2
+54.1
+54
+54
+54
+54
+54
+54
+53.9
+53.9
+53.9
+53.8
+53.8
+53.8
+53.7
+53.6
+53.6
+53.6
+53.6
+53.5
+53.5
+53.4
+53.4
+53.4
+53.4";
+        $arr = explode("\r\n",$str);
+        $record = explode("\r\n",$record_str);
+        $list = DB::table("recruit_ticket as a")->leftJoin("recruit_appoint_info as b","a.appoint_id",'=','b.id')->where('b.recruit_id',18)->whereIn("a.ex_number",$arr)->get();
+
         foreach ($list as $k => $v){
-            $uid = $v->uid;
-            $recruit_id = 18;
-            $appoint_id = $v->id;
-//            $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
-//            if($info){
-//                return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
-//            }
+            $data = [];
             $data = [
-                'recruit_id' => $recruit_id,
-                'appoint_id' => $appoint_id,
-                'uid' => $uid,
-                'status' => 1,
-                'record' => mt_rand(50.0,100)
+                'batch' => 1,
+                'appoint_id' => $v->appoint_id,
+                'recruit_id' => $v->recruit_id,
+                'uid' => $v->uid,
+                'record' => $record[$k],
+                'status' => 0,
+                'result' => null,
+                'select_result' => null
             ];
-            shuffle($option_list);
-            $select = array_slice($option_list,0,rand(1,19));
-            $result = [];
-            if(is_array($select) && count($select) > 0){
-                foreach ($select as $v) {
-                    array_push($result,$v);
-                }
-            }
-            $data['result'] = json_encode($result);
             RecruitAppointSelect::create($data);
-
         }
+        $redis = Cache::getRedis();
+        $quota = [
+            [
+                'name' => '青阳街道',
+                'value' => 29,
+            ],
+            [
+                'name' => '梅岭街道',
+                'value' => 41
+            ],
+            [
+                'name' => '西园街道',
+                'value' => 16
+            ],
+            [
+                'name' => '罗山街道',
+                'value' => 30
+            ],
+            [
+                'name' => '灵源街道',
+                'value' => 18
+            ],
+            [
+                'name' => '新塘街道',
+                'value' => 29
+            ],
+            [
+                'name' => '陈埭镇',
+                'value' => 112
+            ],
+            [
+                'name' => '池店镇',
+                'value' => 80
+            ],
+            [
+                'name' => '安海镇',
+                'value' => 86
+            ],
+            [
+                'name' => '磁灶镇',
+                'value' => 46
+            ],
+            [
+                'name' => '内坑镇',
+                'value' => 38
+            ],
+            [
+                'name' => '紫帽镇',
+                'value' => 9
+            ],
+            [
+                'name' => '东石镇',
+                'value' => 29
+            ],
+            [
+                'name' => '永和镇',
+                'value' => 43
+            ],
+            [
+                'name' => '英林镇',
+                'value' => 25
+            ],
+            [
+                'name' => '金井镇',
+                'value' => 28
+            ],
+            [
+                'name' => '龙湖镇',
+                'value' => 63
+            ],
+            [
+                'name' => '深沪镇',
+                'value' => 29
+            ],
+            [
+                'name' => '西滨镇',
+                'value' => 9
+            ]
+        ];
+        $redis->set('recruit_quota',json_encode($quota));
+
+        dd($arr);
+//        $option_list = [
+//            '青阳街道','梅岭街道','西园街道','罗山街道','灵源街道','新塘街道','陈埭镇','池店镇','安海镇','磁灶镇','内坑镇','紫帽镇','东石镇','永和镇','英林镇','金井镇','龙湖镇','深沪镇','西滨镇'
+//        ];
+//        $list = DB::table("recruit_appoint_info")->where('recruit_id',18)->where('audit',3)->where('pen_audit',1)->where('post_id',309)->get();
+//        foreach ($list as $k => $v){
+//            $uid = $v->uid;
+//            $recruit_id = 18;
+//            $appoint_id = $v->id;
+////            $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
+////            if($info){
+////                return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
+////            }
+//            $data = [
+//                'recruit_id' => $recruit_id,
+//                'appoint_id' => $appoint_id,
+//                'uid' => $uid,
+//                'status' => 1,
+//                'record' => mt_rand(50.0,100)
+//            ];
+//            shuffle($option_list);
+//            $select = array_slice($option_list,0,rand(1,19));
+//            $result = [];
+//            if(is_array($select) && count($select) > 0){
+//                foreach ($select as $v) {
+//                    array_push($result,$v);
+//                }
+//            }
+//            $data['result'] = json_encode($result);
+//            RecruitAppointSelect::create($data);
+//
+//        }
 
 
 

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

@@ -47,6 +47,10 @@
         }
         .list-group{
             padding: 20px;
+            width: 80%;
+            margin: 20px auto;
+            border: 2px dashed #ccc;
+            min-height: 1200px;
         }
         .list-group-item{
             border-radius: 10px;
@@ -86,12 +90,12 @@
         <div class="recruit_container clearfix">
             <div class="recruit_show_content" style="margin-top: 10px;width: 100%">
                 <div class="title" style="text-align: center"><h2>晋江市公开招聘第十三批村务（社区）专职工作者择岗系统</h2></div>
-                <div>
-                    <div class="operation">
-                        <el-button type="success" @click="rand()">生成随机测试数据</el-button> <el-button type="success" @click="enter()">进入指定测试数据</el-button>
-                    </div>
-                    <p style="text-align: center;line-height: 30px">当前测试数据：uid->{{ $info->uid }}；recruit_id->{{ $info->recruit_id }};appoint_id->{{ $info->appoint_id }}</p>
-                </div>
+{{--                <div>--}}
+{{--                    <div class="operation">--}}
+{{--                        <el-button type="success" @click="rand()">生成随机测试数据</el-button> <el-button type="success" @click="enter()">进入指定测试数据</el-button>--}}
+{{--                    </div>--}}
+{{--                    <p style="text-align: center;line-height: 30px">当前测试数据：uid->{{ $info->uid }}；recruit_id->{{ $info->recruit_id }};appoint_id->{{ $info->appoint_id }}</p>--}}
+{{--                </div>--}}
                 <div role="alert" class="el-message el-message--error" style="position:relative" v-if="status == -1">
                     <i class="el-message__icon el-icon-error"></i>
                     <p class="el-message__content">您已放弃择岗</p>
@@ -105,8 +109,8 @@
                         <div class="select">
                             <h2>意向镇（街道）</h2>
                             <draggable  :list="select_list" :disabled="!enabled" class="list-group" ghost-class="ghost" @start="dragging = true" @end="dragging = false" v-bind="dragOptions">
-                                <div class="list-group-item" v-for="element in select_list" :key="element.name" v-text="element.name">
-
+                                <div class="list-group-item" v-for="(element,index) in select_list" :key="element.name">
+                                    @{{ index+1 }} @{{ element.name }}
                                 </div>
                             </draggable>
                         </div>
@@ -125,19 +129,16 @@
                         </h2>
                         <div class="tips_body">
                             <p>
-                                1.意向选择：请在右侧，按您的意向顺序，将可选镇（街道）中的选项拖曳进意向镇（街道）中。
-                            </p>
-                            <p>
-                                2.意向排序：鼠标左键单击（点住），拖动排序，完成后松开。
+                                1.志愿优先原则。择岗系统开放后，每名考生按照意向依次对19个镇（街道）进行排序，系统将按照考生填报的镇（街道）顺序，依次进行检索录用。
                             </p>
                             <p>
-                                3.意向可选择1个或多个，请根据自身情况选择。
+                                2.排名优先原则。择岗系统关闭后，系统将按照参与择岗的考生综合成绩分数由高到低对考生进行排名，随后依照排名先后依次检索每一名考生的镇（街道）志愿，对其进行检索录用。
                             </p>
                             <p>
-                                4.每个人有且仅有一次意向选择机会，提交后无法更改，请考虑好后再行提交。
+                                3.检索录用原则。系统按照考生排名当检索到某个考生时，首先将匹配考生填报的第一志愿镇（街道），若此时考生填报的第一志愿镇（街道）仍有空缺的岗位名额，系统将自动将考生录用到该镇（街道），择岗就完成，并不再对考生的其余志愿镇（街道）进行检索匹配；若此时考生填报的第一志愿镇（街道）岗位员额已满，系统将继续检索考生填报的第二志愿镇（街道），以此类推，循环往复，直至考生所填报的最后一个志愿镇（街道）。
                             </p>
                             <p>
-                                5.放弃择岗后将跳过择岗环节，后续无法再次参加。
+                                4.其他注意事项。若出现考生综合成绩分数一致而选择同一镇（街道）岗位的情况，按照笔试卷面成绩由高到低排序，确定优先录取顺序。若笔试的卷面成绩也相同，比较考生所录用的志愿顺序，录用志愿顺序在前者优先录用，录用志愿顺序相同的则全部、超额录用。
                             </p>
                         </div>
                     </div>
@@ -184,6 +185,10 @@
             },
             methods: {
                 post: function() {
+                    if(this.select_list.length != 19){
+                        this.$message.error('请对19个镇（街道）进行排序！');
+                        return false;
+                    }
                     var msg = "您正在提交择岗的操作！";
                     this.$confirm(msg, '警告', {
                         confirmButtonText: '确认提交',
@@ -279,7 +284,7 @@
             computed: {
                 dragOptions() {
                     return {
-                        animation: 200,
+                        animation: 500,
                         group: "description",
                         disabled: false,
                         ghostClass: "ghost"

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

@@ -96,6 +96,9 @@
                     <a href="{{ route('recruit.material_supplement',array('id'=>$recruit->id)) }}" >
                         <li style="background:#67C23A;float: left;margin-bottom:10px;">考察审核</li>
                     </a>
+                    <a href="{{ route('recruit.post_select',array('recruit_id'=>$recruit->id)) }}" >
+                        <li style="background:#764DB3;float: left;margin-bottom:10px;">择岗</li>
+                    </a>
                 @endif
                 <div style="clear: both;"></div>
             </ul>
@@ -205,34 +208,37 @@
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">考生健康申明卡及安全考试承诺书</span>
             </p>
             <p style="margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内(8月5日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内(8月18日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
             </p>
             <p style="margin-left: 0;text-indent: 0;line-height: 37px;text-align: center">
                 <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">姓名：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->realname}}&nbsp;</span></span></strong>&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">性别：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->sex == 0 ? '女' : '男'}}&nbsp;</span></span></strong>&nbsp;&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">身份证号：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->card}}&nbsp;<span style="font-family:微软雅黑">&nbsp;</span></span></span></strong>&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">有效手机联系方式：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp; {{$appoint_info->mobile}}&nbsp;</span></span></strong>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 14px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp; &nbsp;</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">1.本人过去一个月内为新冠肺炎病例或无症状感染者，前10天为新冠肺炎病例、无症状感染者的密接者，前7天为新冠肺炎病例、无症状感染者次密接者。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp; &nbsp;</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">1.1.本人过去7日内，有出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。</span>
+            </p>
+            <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">2.本人属于新冠肺炎确诊病例、无症状感染者。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">2.本人前7天内有境内中高风险地区及所在县（市、区）旅居史。境内中高风险地区动态变化，以国务院客户端小程序及时发布的名单为准。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">3.本人属于集中医学观察期、居家医学观察、居家健康监测期内的人员。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">3.本人属于前10天内有境外旅居史和接触史的人员。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">4.本人过去7日内，有中高风险地区（以考试当日国家卫生健康委公布数据为准）所在县（市、区）旅居史。&nbsp;</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">4.本人属于核验个人“健康码”或行程卡异常经调查核实不能排除新冠涉疫情况人员。&nbsp;</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">5.本人过去10日内从境外（含港澳台）入境。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">5.本人属于原则上未完成全程新冠疫苗接种人员（能提供医疗机构的新冠疫苗接种禁忌证明除外）的人员。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">6.本人过去10日内与新冠肺炎确诊病例、疑似病例或已发现无症状感染者有接触史。 </span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">6.本人过去7日内，有出现发热（≥37.3℃）、干咳、乏力、鼻塞、流涕、咽痛、嗅觉味觉减退、结膜炎、肌肉痛、腹泻等症状，未排除疑似传染病。 </span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">7.本人过去10日内与来自境外（含港澳台）人员有接触史。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">7.本人共同居住的家庭成员中有上述1至6的情况。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">8.本人共同居住的家庭成员中有上述1至7的情况。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺不存在上述1-7情形。</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">如因隐瞒或虚假填报引起检疫传染病传播或者有传播严重危险而影响公共安全的后果，本人将承担相应的法律责任，自愿接受《中华人民共和国刑法》《治安管理处罚法》《传染病防治法》和《关于依法惩治妨害新型冠状病毒感染肺炎疫情防控违法犯罪的意见》等法律法规的处罚和制裁。</span>
+                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺不存在上述1-8情形。</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">如因隐瞒或虚假填报引起检疫传染病传播或者有传播严重危险而影响公共安全的后果，本人将承担相应的法律责任，自愿接受《中华人民共和国刑法》《治安管理处罚法》《传染病防治法》和《关于依法惩治妨害新型冠状病毒感染肺炎疫情防控违法犯罪的意见》等法律法规的处罚和制裁。</span>
             </p>
             <p style="margin-top:8px;margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px"><input type="checkbox" class="agree_commit" /> 我已知晓上述内容并承诺遵守。</span>
@@ -260,7 +266,7 @@
                     <tbody>
                     <tr>
                         <td style="line-height: 37px" width="90%">
-                            1.本人是否为曾因犯罪受过刑事处罚或曾被开除公职的人员；
+                            1.本人为现役军人；
                         </td>
                         <td>
                             <input type="radio"  name="q11" value="1" />是
@@ -271,7 +277,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            2.本人是否为被开除中国共产党党籍的人员；
+                            2.本人为普通高等院校全日制在读的非应届毕业生；
                         </td>
                         <td>
                             <input type="radio"  name="q12" value="1" />是
@@ -282,7 +288,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            3.本人是否为在近三年内被认定有人事考试作弊行为的人员；
+                            3.本人曾受过刑事处罚的或涉嫌违法犯罪尚未查清；
                         </td>
                         <td>
                             <input type="radio"  name="q13" value="1" />是
@@ -293,7 +299,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            4.本人是否为被依法列为失信联合惩戒对象的人员；
+                            4.本人因聚众赌博、嫖娼等被处以治安拘留及以上处罚，或有涉毒问题；
                         </td>
                         <td>
                             <input type="radio"  name="q14" value="1" />是
@@ -304,7 +310,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            5.本人是否为现役军人；
+                            5.本人为尚未解除党纪、政纪处分或正在接受纪律审查的人员；
                         </td>
                         <td>
                             <input type="radio"  name="q15" value="1" />是
@@ -315,7 +321,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            6.本人是否为普通高等院校全日制在读的非应届毕业生；
+                            6.本人曾因违纪违规被开除辞退解聘；
                         </td>
                         <td>
                             <input type="radio"  name="q16" value="1" />是
@@ -326,7 +332,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            7.本人是否为法律法规规章规定不得报考的其他情形的人员。
+                            7.本人曾参加非法组织、邪教组织或者从事其他危害国家安全活动；
                         </td>
                         <td>
                             <input type="radio"  name="q17" value="1" />是
@@ -335,15 +341,48 @@
                             <input type="radio"  name="q17" value="0" />否
                         </td>
                     </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            8.本人被列为失信被执行人且尚未履行义务；
+                        </td>
+                        <td>
+                            <input type="radio"  name="q18" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q18" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            9.本人在各级公务员、事业单位招考中被认定有舞弊等严重违反纪律行为；
+                        </td>
+                        <td>
+                            <input type="radio"  name="q19" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q19" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            10.本人存在法律法规规定的其他不得报考的情形。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q20" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q20" value="0" />否
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
             </form>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 43px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700">特别提示：</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700"><span style="font-family:微软雅黑">以上项目中如有“是”的，不得参加考试。</span></span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700">特别提示：</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700"><span style="font-family:微软雅黑">存在上述1-10情形的，不得参加考试。</span></span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺：</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人保证所提交的报名信息和相关证明材料真实、准确、有效，如提供虚假信息和证明材料，本人愿承担一切责任。</span>
+                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺不存在上述1-10情形。</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人保证所提交的报名信息和相关证明材料真实、准确、有效，如提供虚假信息和证明材料，本人愿承担一切责任。</span>
             </p>
             <p style="margin-top:8px;margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px"><input type="checkbox" class="agree_commit1" /> 我已知晓上述内容并承诺遵守</span>
@@ -551,7 +590,7 @@
                                                 total++;
                                             }
                                         });
-                                        if(total != 7){
+                                        if(total != 10){
                                             disapperTooltip("remind", "请勾选以上项目！");
                                             return false;
                                         }