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

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

@@ -2437,6 +2437,42 @@ class IndexController extends WebBaseController
         return view('app.recruit.interviewer', $return_data);
     }
 
+    public function supplement_info(Request $request)
+    {
+        $user = $this->getUser();
+        if (!empty($user)) {
+            $uid = $user->id;
+        } else {
+            return redirect(route('login'));
+        }
+
+        //招考id
+        $id = $request->input('id', 0);
+        if (!$id) {
+            return $this->showMessage('请选择报名项目！', route('home'), true, '上一页', '3');
+        }
+        $recruit = Recruit::find($id);
+        if(!$recruit['status']){
+            return $this->showMessage('抱歉，该项目状态不正确，请联系客服！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
+        }
+
+        $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',$id)->first();
+        if(!$appoint_info){
+            return $this->showMessage('抱歉，您没有报名，无需补充信息！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
+        }
+        if($appoint_info->pen_audit != 1){
+            return $this->showMessage('抱歉，您未入闱，无需考察审核！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
+        }
+
+
+        $limit_time = 1660901400;
+        $time = time();
+        if( $time > $limit_time){
+            return $this->showMessage('抱歉，考察审核端口已关闭！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
+        }
+
+        $info = RecruitSupplement::where('appoint_id',$appoint_info->id)->where('type','supplement')->first();
+    }
 
 
 }

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

@@ -88,7 +88,7 @@
                     </a>
                 @endif
                 @if($recruit->id == 19)
-                    <a href="{{ route('recruit.health_info',array('id'=>$recruit->id,'type' => 'pen')) }}" >
+                    <a href="{{ route('recruit.health_info',array('id'=>$recruit->id,'type' => 'face')) }}" >
                         <li style="background:#EFC1B3;float: left;margin-bottom:10px;">健康信息登记</li>
                     </a>
                 @endif
@@ -158,31 +158,31 @@
                 <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小时内（具体时间要求以面试通知书上为准）新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询），且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”、“通信大数据行程卡”未带星标及体温正常者方可允许进场参加考试。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内(8月25日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通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.本人过去14日内，有出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。</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.本人过去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.本人属于新冠肺炎确诊病例、无症状感染者。&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">3.本人属于集中医学观察期、居家医学观察期内的人员。</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">4.本人过去14日内，有中高风险地区（以考试当日国家卫生健康委公布数据为准）旅居史。&nbsp;</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">5.本人过去21日内从境外（含港澳台）入境。</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">6.本人过去14日内与新冠肺炎确诊病例、疑似病例或已发现无症状感染者有接触史。</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">7.本人过去14日内与来自境外（含港澳台）人员有接触史。</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">8.本人共同居住的家庭成员中有上述1至7的情况。</span>