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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1061,7 +1061,7 @@ class RecruitController extends Controller
             ];
             $info->identification = json_decode($info->identification);
             $photo_data = [];
-            if(is_array($info->identification)){
+            if(is_array($info->identification) && count($info->identification) > 0){
                 foreach ($info->identification as $k => $v) {
                     if($v->status){
                         $photo_data[] = [
@@ -1080,7 +1080,7 @@ class RecruitController extends Controller
             ];
             $info->household_register = json_decode($info->household_register);
             $photo_data = [];
-            if(is_array($info->household_register)){
+            if(is_array($info->household_register)  && count($info->household_register) > 0){
                 foreach ($info->household_register as $k => $v) {
                     if($v->status){
                         $photo_data[] = [
@@ -1099,7 +1099,7 @@ class RecruitController extends Controller
             ];
             $info->education_certification = json_decode($info->education_certification);
             $photo_data = [];
-            if(is_array($info->education_certification)){
+            if(is_array($info->education_certification)  && count($info->education_certification) > 0){
                 foreach ($info->education_certification as $k => $v) {
                     if($v->status){
                         $photo_data[] = [
@@ -1135,7 +1135,7 @@ class RecruitController extends Controller
 //            ];
             $info->chengxin = json_decode($info->chengxin);
             $photo_data = [];
-            if(is_array($info->chengxin)){
+            if(is_array($info->chengxin) && count($info->chengxin) > 0){
                 foreach ($info->chengxin as $k => $v) {
                     if($v->status){
                         $photo_data[] = [
@@ -1156,7 +1156,7 @@ class RecruitController extends Controller
 
             $info->manage = json_decode($info->manage);
             $photo_data = [];
-            if(is_array($info->manage)){
+            if(is_array($info->manage) && count($info->manage) > 0){
                 foreach ($info->manage as $k => $v) {
                     if($v->status){
                         $photo_data[] = [

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

@@ -1975,14 +1975,14 @@ class IndexController extends WebBaseController
         } else {
             return redirect(route('login'));
         }
-        $limit_time = 1662543000;
+        $limit_time = 1694079000;
         $time = time();
         if( $time > $limit_time){
-            return $this->showMessage('抱歉，考察审核端口已关闭！', route('recruit.show',array('id',18)), true, '上一页', '3');
+            return $this->showMessage('抱歉，考察审核端口已关闭！', route('recruit.show',array('id',38)), true, '上一页', '3');
         }
 
         $appoint_id = $request->input('appoint_id');
-        $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',18)->where('id',$appoint_id)->first();
+        $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',38)->where('id',$appoint_id)->first();
         if(!$appoint_info){
             return ['status' => 0, 'msg' => '抱歉，找不到您要补登的报名记录！'];
         }
@@ -2038,6 +2038,17 @@ class IndexController extends WebBaseController
 //                }
 //            }
 //            $info->family_planning = json_encode($family_planning);
+            //失信查询 情况
+            $chengxin = $request->input('chengxin');
+            if(is_array($chengxin)){
+                //删除掉没有成功返回路径的图片
+                foreach ($chengxin as $k => $v){
+                    if(!array_key_exists('response',$v)){
+                        unset($chengxin[$k]);
+                    }
+                }
+            }
+            $info->chengxin = json_encode($chengxin);
             //综治
             $manage = $request->input('manage');
             if(is_array($manage)){
@@ -2100,6 +2111,17 @@ class IndexController extends WebBaseController
 //                }
 //            }
 //            $data['family_planning'] = json_encode($family_planning);
+            //失信查询 情况
+            $chengxin = $request->input('chengxin');
+            if(is_array($chengxin)){
+                //删除掉没有成功返回路径的图片
+                foreach ($chengxin as $k => $v){
+                    if(!array_key_exists('response',$v)){
+                        unset($chengxin[$k]);
+                    }
+                }
+            }
+            $data['chengxin'] = json_encode($chengxin);
             //综治
             $manage = $request->input('manage');
             if(is_array($manage)){

resources/views/admin/recruit/ajax_supplement.blade.php

@@ -45,36 +45,6 @@
                         </div>
                     </td>
                 </tr>
-                <tr style="height:52px;page-break-inside:avoid">
-                    <td valign="center">
-                        户口簿（户主页及本人页）
-                    </td>
-                    <td valign="center" colspan="11">
-                        <div style="padding: 10px 0">
-                            @foreach($info->household_register as $k => $v)
-                                @if(!empty($v))
-                                    <img class="attchment" data-key="{{$k}}" data-name="household_register"
-                                         src="{{ $v->response->path }}" width="200"/>
-                                @endif
-                            @endforeach
-                        </div>
-                    </td>
-                </tr>
-                <tr style="height:52px;page-break-inside:avoid">
-                    <td valign="center">
-                        毕业证书及学信网《教育部学历证书电子注册备案表》
-                    </td>
-                    <td valign="center" colspan="11">
-                        <div style="padding: 10px 0">
-                            @foreach($info->education_certification as $k => $v)
-                                @if(!empty($v))
-                                    <img class="attchment" data-key="{{$k}}" data-name="education_certification"
-                                         src="{{ $v->response->path }}" width="200"/>
-                                @endif
-                            @endforeach
-                        </div>
-                    </td>
-                </tr>
                 <tr style="height:52px;page-break-inside:avoid">
                     <td valign="center">
                         失信查询情况