更新考察审核（递补）

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

@@ -2506,93 +2506,24 @@ class IndexController extends WebBaseController
         }
         //手动设置择岗时间段
         $time = time();
-        if ($time > 1726545600 || $time < 1726217645) {
+        if ($time > 1727150400 || $time < 1726217645) {
             //if($time > 1694491200){
             return $this->showMessage('抱歉，未到择岗时间！', route('recruit.show', ['id', $recruit_id]), true, '上一页', '2');
         }
-        if ($info->type == 1) {
-            $option_list = [
-                [
-                    'id'   => 1,
-                    'name' => '青阳街道',
-                ],
-                [
-                    'id'   => 2,
-                    'name' => '梅岭街道',
-                ],
-                [
-                    'id'   => 3,
-                    'name' => '西园街道',
-                ],
-                [
-                    'id'   => 4,
-                    'name' => '灵源街道',
-                ],
-                [
-                    'id'   => 5,
-                    'name' => '新塘街道',
-                ],
-                [
-                    'id'   => 6,
-                    'name' => '陈埭镇',
-                ],
-                [
-                    'id'   => 7,
-                    'name' => '池店镇',
-                ],
-                [
-                    'id'   => 8,
-                    'name' => '安海镇',
-                ],
-                [
-                    'id'   => 9,
-                    'name' => '磁灶镇',
-                ],
-                [
-                    'id'   => 10,
-                    'name' => '紫帽镇',
-                ],
-                [
-                    'id'   => 11,
-                    'name' => '永和镇',
-                ],
-                [
-                    'id'   => 12,
-                    'name' => '金井镇',
-                ],
-                [
-                    'id'   => 13,
-                    'name' => '龙湖镇',
-                ],
-                [
-                    'id'   => 14,
-                    'name' => '深沪镇'
-                ],
-                [
-                    'id'   => 15,
-                    'name' => '西滨镇'
-                ],
-                [
-                    'id'   => 16,
-                    'name' => '经济开发区'
-                ]
-            ];
-        } else {
-            $option_list = [
-                [
-                    'id'   => 5,
-                    'name' => '陈埭镇',
-                ],
-                [
-                    'id'   => 6,
-                    'name' => '金井镇',
-                ],
-                [
-                    'id'   => 7,
-                    'name' => '龙湖镇',
-                ],
-            ];
-        }
+        $option_list = [
+            [
+                'id'   => 1,
+                'name' => '陈埭镇',
+            ],
+            [
+                'id'   => 2,
+                'name' => '金井镇',
+            ],
+            [
+                'id'   => 3,
+                'name' => '深沪镇'
+            ]
+        ];
 
 
         $select_list = [];
@@ -2717,7 +2648,7 @@ class IndexController extends WebBaseController
     public function select_result(Request $request)
     {
         $redis = Cache::getRedis();
-        $redis->set('recruit_quota_batch4', '');
+        $redis->set('recruit_quota_batch5', '');
 
         return view('app.recruit.select_result');
     }
@@ -2725,83 +2656,31 @@ class IndexController extends WebBaseController
     public function get_select_result(Request $request)
     {
         $redis = Cache::getRedis();
-        $quot_batch4 = $redis->get('recruit_quota_batch4');
-        if (!$quot_batch4) {
-            $quot_batch4 = [
-                [
-                    'name'  => '青阳街道',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '梅岭街道',
-                    'value' => 10,
-                ],
-                [
-                    'name'  => '西园街道',
-                    'value' => 6,
-                ],
-                [
-                    'name'  => '灵源街道',
-                    'value' => 2,
-                ],
-                [
-                    'name'  => '新塘街道',
-                    'value' => 8,
-                ],
+        $quot_batch5 = $redis->get('recruit_quota_batch5');
+        if (!$quot_batch5) {
+            $quot_batch5 = [
                 [
                     'name'  => '陈埭镇',
-                    'value' => 30,
-                ],
-                [
-                    'name'  => '池店镇',
-                    'value' => 7,
-                ],
-                [
-                    'name'  => '安海镇',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '磁灶镇',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '紫帽镇',
-                    'value' => 5,
-                ],
-                [
-                    'name'  => '永和镇',
-                    'value' => 4,
+                    'value' => 21,
                 ],
                 [
                     'name' => '金井镇',
-                    'value' => 6
-                ],
-                [
-                    'name' => '龙湖镇',
                     'value' => 3
                 ],
                 [
                     'name' => '深沪镇',
-                    'value' => 3
-                ],
-                [
-                    'name' => '西滨镇',
                     'value' => 2
-                ],
-                [
-                    'name' => '经济开发区',
-                    'value' => 4
                 ]
             ];
-            $redis->set('recruit_quotaA', json_encode($quot_batch4));
+            $redis->set('recruit_quotaA', json_encode($quot_batch5));
         } else {
-            $quot_batch4 = json_decode($quot_batch4, true);
+            $quot_batch5 = json_decode($quot_batch5, true);
         }
-        $list         = DB::table('recruit_appoint_select as a')->leftJoin('recruit_appoint_info as b', 'a.appoint_id', '=', 'b.id')->leftJoin('recruit_ticket as c', 'a.appoint_id', '=', 'c.appoint_id')->whereRaw('a.select_result is null and a.batch=4')->select(['b.realname', 'c.ex_number', 'a.result', 'a.select_result', 'a.id', 'a.record', 'a.record2', 'a.record3'])->orderBy('record', 'desc')->orderBy('record2', 'desc')->orderBy('record3', 'desc')->limit(2)->get()->toArray();
+        $list         = DB::table('recruit_appoint_select as a')->leftJoin('recruit_appoint_info as b', 'a.appoint_id', '=', 'b.id')->leftJoin('recruit_ticket as c', 'a.appoint_id', '=', 'c.appoint_id')->whereRaw('a.select_result is null and a.batch=5')->select(['b.realname', 'c.ex_number', 'a.result', 'a.select_result', 'a.id', 'a.record', 'a.record2', 'a.record3'])->orderBy('record', 'desc')->orderBy('record2', 'desc')->orderBy('record3', 'desc')->limit(2)->get()->toArray();
         $return_data  = [
             'list' => [],
         ];
-        $array_column = array_column($quot_batch4, 'name');
+        $array_column = array_column($quot_batch5, 'name');
         if (count($list) > 1) {
             $current = $list[0];
             $next    = $list[1];
@@ -2815,8 +2694,8 @@ class IndexController extends WebBaseController
         foreach ($person_select_result as $val) {
             //寻找下标
             $index = array_search($val, $array_column);
-            if ($quot_batch4[$index]['value']) {
-                if ($next && $current->record == $next->record && $current->record2 == $next->record2 && $current->record3 == $next->record3 && $quot_batch4[$index]['value'] == 1) {
+            if ($quot_batch5[$index]['value']) {
+                if ($next && $current->record == $next->record && $current->record2 == $next->record2 && $current->record3 == $next->record3 && $quot_batch5[$index]['value'] == 1) {
                     //如果当前处理人员不是最后一个，且分数与下一名人员三个维度完全一样的话并且该人员欲择的岗位仅剩一位，则特殊处理
                     //查找同样分数人同样志愿
                     $next_select_result = json_decode($next->result, true);
@@ -2830,14 +2709,14 @@ class IndexController extends WebBaseController
                 }
                 $quota_data = [
                     'index'     => $index,
-                    'old_value' => $quot_batch4[$index]['value'],
+                    'old_value' => $quot_batch5[$index]['value'],
                 ];
                 //有名额允许择岗
                 DB::table('recruit_appoint_select')->where('id', $current->id)->update(['select_result' => $val, 'status' => 1]);
                 $current->select_result = $val;
-                $quot_batch4[$index]['value']--;
+                $quot_batch5[$index]['value']--;
                 $quota_data['new_value'] = $quot_batch4[$index]['value'];
-                $redis->set('recruit_quota_batch4', json_encode($quot_batch4));
+                $redis->set('recruit_quota_batch4', json_encode($quot_batch5));
                 $flag = 1;
                 break;
             }
@@ -2845,7 +2724,7 @@ class IndexController extends WebBaseController
         if (!$flag) {
             $quota_data = [
                 'index'     => $index,
-                'old_value' => $quot_batch4[$index]['value'],
+                'old_value' => $quot_batch5[$index]['value'],
             ];
             $current->select_result = '未匹配到志愿，本轮择岗不成功！';
             DB::table('recruit_appoint_select')->where('id', $current->id)->update(['select_result' => '未匹配到志愿，本轮择岗不成功！', 'status' => -2]);
@@ -2857,82 +2736,30 @@ class IndexController extends WebBaseController
 
     public function select_init(Request $request)
     {
-        $count = DB::table('recruit_appoint_select')->whereRaw('select_result is null and batch = 4 and type = 1')->count();
+        $count = DB::table('recruit_appoint_select')->whereRaw('select_result is null and batch = 5 and type = 1')->count();
 
         $redis  = Cache::getRedis();
-        $quot_batch4 = $redis->get('recruit_quota_batch4');
-        if (!$quot_batch4) {
-            $quot_batch4 = [
-                [
-                    'name'  => '青阳街道',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '梅岭街道',
-                    'value' => 10,
-                ],
-                [
-                    'name'  => '西园街道',
-                    'value' => 6,
-                ],
-                [
-                    'name'  => '灵源街道',
-                    'value' => 2,
-                ],
-                [
-                    'name'  => '新塘街道',
-                    'value' => 8,
-                ],
+        $quot_batch5 = $redis->get('recruit_quota_batch4');
+        if (!$quot_batch5) {
+            $quot_batch5 = [
                 [
                     'name'  => '陈埭镇',
-                    'value' => 30,
-                ],
-                [
-                    'name'  => '池店镇',
-                    'value' => 7,
-                ],
-                [
-                    'name'  => '安海镇',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '磁灶镇',
-                    'value' => 4,
-                ],
-                [
-                    'name'  => '紫帽镇',
-                    'value' => 5,
-                ],
-                [
-                    'name'  => '永和镇',
-                    'value' => 4,
+                    'value' => 21,
                 ],
                 [
                     'name' => '金井镇',
-                    'value' => 6
-                ],
-                [
-                    'name' => '龙湖镇',
                     'value' => 3
                 ],
                 [
                     'name' => '深沪镇',
-                    'value' => 3
-                ],
-                [
-                    'name' => '西滨镇',
                     'value' => 2
-                ],
-                [
-                    'name' => '经济开发区',
-                    'value' => 4
                 ]
             ];
-            $redis->set('recruit_quota', json_encode($quot_batch4));
+            $redis->set('recruit_quota_batch5', json_encode($quot_batch5));
         }
 
-        $list = DB::table('recruit_appoint_select as a')->leftJoin('recruit_appoint_info as b', 'a.appoint_id', '=', 'b.id')->leftJoin('recruit_ticket as c', 'a.appoint_id', '=', 'c.appoint_id')->whereRaw('a.select_result is not null and a.batch=4 and type = 1')->select(['b.realname', 'c.ex_number', 'a.result', 'a.select_result', 'a.id'])->orderBy('record', 'desc')->get();
-        return ['status' => 1, 'msg' => '获取初始化信息成功', 'data' => ['count' => $count, 'quota' => $quot_batch4, 'list' => $list]];
+        $list = DB::table('recruit_appoint_select as a')->leftJoin('recruit_appoint_info as b', 'a.appoint_id', '=', 'b.id')->leftJoin('recruit_ticket as c', 'a.appoint_id', '=', 'c.appoint_id')->whereRaw('a.select_result is not null and a.batch=5 and type = 1')->select(['b.realname', 'c.ex_number', 'a.result', 'a.select_result', 'a.id'])->orderBy('record', 'desc')->get();
+        return ['status' => 1, 'msg' => '获取初始化信息成功', 'data' => ['count' => $count, 'quota' => $quot_batch5, 'list' => $list]];
     }
 
     public function interviewer_random(Request $request)

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

@@ -129,7 +129,7 @@
                         </h2>
                         <div class="tips_body">
                             <p>
-                                1.志愿优先原则。择岗系统开放后，A类岗位考生从A类岗位的16个镇（街道、经济开发区）中选取志愿镇（街道、经济开发区），每个考生最多可选择16个志愿镇（街道、经济开发区），按照志愿依次对所选取的志愿镇（街道、经济开发区）进行排序，系统将按照考生填报的镇（街道、经济开发区）顺序，依次进行检索录用；若考生未选满16个志愿入职镇（街道、经济开发区），导致未被录用，视为放弃择岗入职权利，原则上从报考A类岗位且综合成绩达到合格线的报考者中，按照综合成绩由高到低确定递补人选，进行1次递补。
+                                1.志愿优先原则。择岗系统开放后，A类岗位考生按照志愿依次对尚未招满的A类岗位3个镇（街道、经济开发区）进行排序，系统将按照考生填报的镇（街道、经济开发区）顺序，依次进行检索录用。
                             </p>
                             <p>
                                 2.排名优先原则。择岗系统关闭后，系统将按照参与择岗的考生综合成绩分数由高到低对考生进行排名，随后依照排名先后依次检索每一名考生的镇（街道、经济开发区）志愿，对其进行检索录用。
@@ -139,6 +139,7 @@
                             </p>
                             <p>
                                 4.其他注意事项。若出现考生综合成绩分数一致而选择同一镇（街道、经济开发区）岗位的情况，按照笔试卷面成绩由高到低排序，确定优先录取顺序；若笔试的卷面成绩也相同，按照写作成绩从高到低排序，确定优先录取顺序；若写作成绩也相同，比较考生所录用的志愿顺序，录用志愿顺序在前者优先录用，录用志愿顺序相同的则全部、超额录用。
+                                择岗咨询电话：0595-36796789。
                             </p>
                         </div>
                     </div>
@@ -191,10 +192,10 @@
                         return false;
                     }
 
-                    if(this.select_list.length == 16){
+                    if(this.select_list.length < 3){
                         var msg = "择岗提交成功后不得改报，请您确认是否继续提交";
                     }else{
-                        var msg = "您未选满16个志愿入职镇（街道、经济开发区），若导致未被录用，视为放弃择岗入职权利，请您确认是否继续提交";
+                        var msg = "您尚未选满3个镇（街道），请按照志愿依次对尚未招满的A类岗位3个镇（街道、经济开发区）进行排序。";
                     }
 
                     this.$confirm(msg, '警告', {