소스 검색

修改笔试成绩模板问题

sandm 3 년 전
부모
커밋
50d6d1ec52
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      app/Admin/Controllers/Recruit/RecruitController.php
  2. 1 1
      app/Admin/Controllers/Recruit/RecruitTicketController.php

+ 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_id',$recruit_id)->where('audit',3)->where('pen_audit',-1)->orderBy('post_id','asc')->get();
+                $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();
                 $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
app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -117,7 +117,7 @@ class RecruitTicketController extends Controller
             ];
             array_push($data,$item);
         }
-        $spreadsheet = IOFactory::load(base_path() . '/storage/app/public/recruit/template/ticket_data_template.xlsx');
+        $spreadsheet = IOFactory::load(base_path() . '/storage/app/public/recruit/ticket/template/ticket_data_template.xlsx');
         $sheet = $spreadsheet->getActiveSheet();
 
         $row = 2;