复试准考证

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

@@ -131,7 +131,12 @@ class IndexController extends WebBaseController
             $reexamine_ticket = RecruitTicket::where('appoint_id',$appoint_info->id)->where('ex_type',4)->first();
 
             if($reexamine_ticket && $appoint_info->reexamine_audit == -1){
-                $appoint_info->reexamine_ticket = 1;
+                $reexamine_health = RecruitSupplement::where("appoint_id",$appoint_info->id)->where("type","reexamine")->where('h_status',1)->first();
+                if(!$reexamine_health){
+                    $appoint_info->reexamine_ticket = -2;
+                }else{
+                    $appoint_info->reexamine_ticket = 1;
+                }
             }else{
                 $appoint_info->reexamine_ticket = 0;
             }
@@ -1398,8 +1403,8 @@ class IndexController extends WebBaseController
                     $post_data = RecruitPost::where('recruit_id',$recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                     $name = $recruit->name_en;
                     $date = date("Y-m-d",strtotime($recruit->created_at));
-                    $filename = $date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id].'_create';
-                    $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/face/" . $filename . '.pdf';
+                    $filename = sha1($date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id]);
+                    $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/reexamine/" . $filename . '.pdf';
                     if(file_exists($file)){
                         header('Content-Description: File Transfer');
                         header('Content-Type: application/octet-stream');

app/Jobs/TicketJob.php

@@ -362,7 +362,7 @@ class TicketJob implements ShouldQueue
                                 'ex_end' => $reexamine_end
                             ];
                             RecruitTicket::create($ticket);
-                            $this->fetch($item,$recruit->reexamine_ticket_content, 'reexamine_audit', $recruit);
+                            $this->fetch($item,$recruit->reexamine_ticket_content, 'reexamine', $recruit);
 
                         }
                         //$this->pdf('pen',$recruit);

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

@@ -211,7 +211,7 @@
                 <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小时内（10月20日14:00及以后）新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内（10月27日14:00及以后）新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通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>
@@ -732,25 +732,81 @@
                         return false;
                     }
 
+                    if(reexamine_ticket == -2){
+                        disapperTooltip("remind", "健康信息未上传，即将自动跳转至上传界面！");
+                        setTimeout(function(){
+                            window.location.href="{!! route('recruit.health_info',array('id'=>$recruit->id,'type' => 'reexamine')) !!}"
+                        },2000);
+                        return false;
+                    }
+
                     if (isVisitorutype == '1') {
                         disapperTooltip("remind", "只有登录个人会员才可打印！");
                         return false;
                     } else {
+                        {{--var qsDialog = $(this).dialog({--}}
+                        {{--    loading: true,--}}
+                        {{--    header: false,--}}
+                        {{--    border: false,--}}
+                        {{--    btns: ['打印准考证','取消'],--}}
+                        {{--    yes: function(){--}}
+                        {{--        if($($(".agree_commit_normal")[1]).prop('checked')){--}}
+                        {{--            window.location.href = "{!! route('recruit.reexamine_ticket',['recruit_id'=>$recruit->id]) !!}";--}}
+                        {{--        }else{--}}
+                        {{--            alert('请阅读并承诺遵守《安全考试承诺书》');--}}
+                        {{--        }--}}
+                        {{--    }--}}
+                        {{--});--}}
+                        {{--qsDialog.setContent($('#commit0').html());--}}
                         var qsDialog = $(this).dialog({
                             loading: true,
                             header: false,
                             border: false,
-                            btns: ['打印准考证','取消'],
+                            btns: ['下一份','取消'],
                             yes: function(){
-                                if($($(".agree_commit_normal")[1]).prop('checked')){
-                                    window.location.href = "{!! route('recruit.reexamine_ticket',['recruit_id'=>$recruit->id]) !!}";
-                                }else{
-                                    alert('请阅读并承诺遵守《安全考试承诺书》');
+                                qsDialog.setCloseDialog(false);
+                                if(!$($(".agree_commit")[1]).prop('checked')){
+                                    disapperTooltip("remind", "请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》！");
+                                    //alert('请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》');
+                                    return false;
                                 }
+                                qsDialog.setCloseDialog(true);
+                                var dialog_1 = $(this).dialog({
+                                    loading: true,
+                                    header: false,
+                                    border: false,
+                                    btns: ['打印准考证','取消'],
+                                    yes: function(){
+                                        dialog_1.setCloseDialog(false);
+                                        var must = 1,total = 0;
+                                        $.each($($(".commit_step_2")[1]).find("input"),function(){
+                                            if(this.checked){
+                                                if($(this).val() == 1){
+                                                    must = 0;
+                                                }
+                                                total++;
+                                            }
+                                        });
+                                        if(total != 6){
+                                            disapperTooltip("remind", "请勾选以上项目！");
+                                            return false;
+                                        }
+                                        if(!must){
+                                            disapperTooltip("remind", "不符合参加考试条件，请检查！");
+                                            return false;
+                                        }
+                                        if(!$($(".agree_commit1")[1]).prop('checked')){
+                                            disapperTooltip("remind", "请阅读并承诺遵守《考生报考承诺书》！");
+                                            return false;
+                                        }
+                                        dialog_1.setCloseDialog(true);
+                                        window.location.href = "{!! route('recruit.reexamine_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
+                                    }
+                                });
+                                dialog_1.setContent($('#commit1').html())
                             }
                         });
-                        qsDialog.setContent($('#commit0').html());
-
+                        qsDialog.setContent($('#commit').html());
                     }
                 } else {
                     var qsDialog = $(this).dialog({