Browse Source

修改笔试成绩模板问题

sandm 3 years ago
parent
commit
82302b177d

+ 1 - 1
app/Admin/Controllers/Recruit/RecruitController.php

@@ -1904,7 +1904,7 @@ class RecruitController extends Controller
         $type = $request->input('type','pen');
         switch ($type){
             case 'pen':
-                $list = RecruitAppointInfo::where('recruit_appoint_info.recruit_id',$recruit_id)->where('recruit_appoint_info.audit',3)->where('recruit_appoint_info.pen_audit',-1)->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')->select('recruit_appoint_info.*','recruit_ticket.ex_number')->orderBy('post_id','asc')->get();
+                $list = RecruitAppointInfo::where('recruit_id',$recruit_id)->where('audit',3)->where('pen_audit',-1)->orderBy('post_id','asc')->get();
                 $post_data = RecruitPost::where('recruit_id',$recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                 $data = [];
                 foreach ($list as $k => $v){

+ 1 - 1
resources/views/admin/recruit/ajax_record.blade.php

@@ -44,7 +44,7 @@
                                         1.成绩只能上传一次,操作日志记录且无法修改,请谨慎操作!
                                     </p>
                                     <p>
-                                        2.<a href="{{ route('recruit.create_record_template',['recruit_id' => $recruit->id]) }}" target="_blank">点我下载</a>成绩导入信息模板。
+                                        2.<a href="{{ route('recruit.create_record_template',['recruit_id' => $recruit->id,'type' => 'pen']) }}" target="_blank">点我下载</a>成绩导入信息模板。
                                     </p>
                                 </div>
                                 <div class="form-group">