人才疗休养

app/Admin/Controllers/Content/RecuperateApplyController.php

@@ -89,7 +89,7 @@ class RecuperateApplyController extends Controller
             ];
             return $level_arr[$this->level];
         });
-        $grid->condition("适用对象类型");
+        /*$grid->condition("适用对象类型");
         $grid->column('个税社保')->display(function () {
             $level_arr = [
                 '',
@@ -105,7 +105,8 @@ class RecuperateApplyController extends Controller
                 '否',
             ];
             return $level_arr[$this->salary];
-        });
+        });*/
+        $grid->validate_time('人才有效期');
         $grid->created_at('报名时间');
         $grid->column('审核状态')->display(function () {
             $status_arr = [

app/Http/Controllers/Mobile/Recuperate/RecuperateController.php

@@ -102,13 +102,13 @@ class RecuperateController extends MobileBaseController
             return $this->showMessage('请到个人中心填写身份证号', $back_url, true, '上一页', '3');
         }
 
-        if(date('Y',time())!='2021'){
-            $verification=$this->verification($member->id,$info,$members_info);
-            if(!$verification['state']){
-                $back_url = \Illuminate\Support\Facades\URL::previous();
-                return $this->showMessage($verification['msg'].'，具体事项请咨询晋江人社局0595-85633128', $back_url, true, '上一页', '3');
-            }
-        }
+//        if(date('Y',time())!='2021'){
+//            $verification=$this->verification($member->id,$info,$members_info);
+//            if(!$verification['state']){
+//                $back_url = \Illuminate\Support\Facades\URL::previous();
+//                return $this->showMessage($verification['msg'].'，具体事项请咨询晋江人社局0595-85633128', $back_url, true, '上一页', '3');
+//            }
+//        }
 
         $return_data = [
             'wap_title' => '优秀人才疗休养活动报名',
@@ -133,13 +133,13 @@ class RecuperateController extends MobileBaseController
 
         $recuperate=Recuperate::where('id',$data['recuperate_id'])->select('price')->first();
 
-        if(date('Y',time())!='2021'){
-            $verification=$this->verification($uid,$recuperate);
-            if(!$verification['state']){
-                return $this->sendErrorResponse($verification['msg'].'，具体事项请咨询晋江人社局0595-85633128', '', 400);
-            }
-            $data['recuperate_time_id'] = $verification['info']->id;
-        }
+//        if(date('Y',time())!='2021'){
+//            $verification=$this->verification($uid,$recuperate);
+//            if(!$verification['state']){
+//                return $this->sendErrorResponse($verification['msg'].'，具体事项请咨询晋江人社局0595-85633128', '', 400);
+//            }
+//            $data['recuperate_time_id'] = $verification['info']->id;
+//        }
 
         //报名
         $data['uid'] = $uid;

app/Http/Controllers/Web/Recuperate/RecuperateController.php

@@ -51,15 +51,15 @@ class RecuperateController extends WebBaseController
             $back_url = \Illuminate\Support\Facades\URL::previous();
             return $this->showMessage('资讯不存在', $back_url, true, '上一页', '3');
         }
-        $uid = auth('web-member')->id();
-        $recuperate_app=RecuperateApply::where('uid',$uid)->where('recuperate_id',$id)->first();
+        $uid            = auth('web-member')->id();
+        $recuperate_app = RecuperateApply::where('uid', $uid)->where('recuperate_id', $id)->first();
         //增加点击量
         $this->recuperateService->incrementData(['id' => $id], 1, 'click');
 
-        $return_data = array(
-            'info'=>$info,
-            'recuperate_app'=>$recuperate_app
-        );
+        $return_data = [
+            'info'           => $info,
+            'recuperate_app' => $recuperate_app,
+        ];
 
         return view('app.recuperate.show', $return_data);
     }
@@ -67,20 +67,20 @@ class RecuperateController extends WebBaseController
     public function apply($id)
     {
 
-       // http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance?idCard=350581198601242040&phone=15959581739&year=2019
+        // http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance?idCard=350581198601242040&phone=15959581739&year=2019
 
-/*        $data['idCard']='350581198601242040';
-        $data['phone']='15959581739';
-        $data['year']='2019';
-        $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
-        dd(json_decode($result_json));*/
+        /*        $data['idCard']='350581198601242040';
+                $data['phone']='15959581739';
+                $data['year']='2019';
+                $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
+                dd(json_decode($result_json));*/
 
 
-/*       $data['idCard']='130630199212251815';
-        $data['phone']='17689494919';
-        $data['year']='2019';
-        $result_json = https_request('http://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
-        dd(json_decode($result_json)->state);*/
+        /*       $data['idCard']='130630199212251815';
+                $data['phone']='17689494919';
+                $data['year']='2019';
+                $result_json = https_request('http://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
+                dd(json_decode($result_json)->state);*/
 
         //获取详情
         $info = $this->recuperateService->getRecuperateInfo($id);
@@ -91,65 +91,66 @@ class RecuperateController extends WebBaseController
 
         /*查看手机是否认证*/
         $member = auth('web-member')->user();
-        if($member->mobile_audit!='1'){
-           // $back_url = \Illuminate\Support\Facades\URL::previous();;
+        if ($member->mobile_audit != '1') {
+            // $back_url = \Illuminate\Support\Facades\URL::previous();;
             return $this->showMessage('请到个人中心先认证手机号码', route('person.memberInfo'), true, '上一页', '3');
         }
-        $members_info=MemberInfo::where('uid',$member->id)->select('realname','id_card','phone','card_t_cn')->first();
+        $members_info = MemberInfo::where('uid', $member->id)->select('realname', 'id_card', 'phone', 'card_t_cn')->first();
 
-/*        if($members_info->card_t_cn!='306' || !$members_info->id_card){
-            $back_url = \Illuminate\Support\Facades\URL::previous();
-            return $this->showMessage('请到个人中心填写身份证号', $back_url, true, '上一页', '3');
-        }*/
+        /*        if($members_info->card_t_cn!='306' || !$members_info->id_card){
+                    $back_url = \Illuminate\Support\Facades\URL::previous();
+                    return $this->showMessage('请到个人中心填写身份证号', $back_url, true, '上一页', '3');
+                }*/
 
 
-         /*if(date('Y',time())!='2022'){
-            $verification=$this->verification($member->id,$info,$members_info);
-             if(!$verification['state']){
-                 $back_url = \Illuminate\Support\Facades\URL::previous();
-                 return $this->showMessage($verification['msg'], $back_url, true, '上一页', '3');
-             }
-         }*/
+        /*if(date('Y',time())!='2022'){
+           $verification=$this->verification($member->id,$info,$members_info);
+            if(!$verification['state']){
+                $back_url = \Illuminate\Support\Facades\URL::previous();
+                return $this->showMessage($verification['msg'], $back_url, true, '上一页', '3');
+            }
+        }*/
 
 
         $return_data = [
-            'info'      => $info,
-            'members'  =>array_merge($member->toArray(),$members_info->toArray(),['year'=>date('Y',strtotime("-1 year"))])
+            'info'    => $info,
+            'members' => array_merge($member->toArray(), $members_info->toArray(), ['year' => date('Y', strtotime("-1 year"))]),
         ];
 
         return view('app.recuperate.apply', $return_data);
     }
 
-    protected function  verification($uid,$info,$members_info=false){
-        $year=date('Y', strtotime("-1 year"));
-        $recuperate_time=RecuperateTime::where('uid',$uid)->where('year',$year)->first();
+    protected function verification($uid, $info, $members_info = false)
+    {
+        $year            = date('Y', strtotime("-1 year"));
+        $recuperate_time = RecuperateTime::where('uid', $uid)->where('year', $year)->first();
+
+        if ($recuperate_time) {
+            $old_integral = RecuperateApply::where('uid', $uid)->where('recuperate_time_id', $recuperate_time->id)->where('status', '!=', 2)->sum('price');
+            if ($recuperate_time->price < ($old_integral + $info['price'])) {
+                return ['state' => 0, 'msg' => '今年的金额额度不够'];
+            } else {
+                return ['state' => 1, 'msg' => 'ok', 'info' => $recuperate_time];
+            }
+        } else {
 
-        if($recuperate_time){
-            $old_integral=RecuperateApply::where('uid',$uid)->where('recuperate_time_id',$recuperate_time->id)->where('status','!=',2)->sum('price');
-            if($recuperate_time->price<($old_integral+$info['price'])){
-               return  ['state'=>0,'msg'=>'今年的金额额度不够'];
-            }else{
-                return ['state'=>1,'msg'=>'ok','info'=>$recuperate_time];
+            $data['idCard'] = $members_info->id_card;
+            $data['phone']  = $members_info->phone;
+            $arr['year']    = $data['year'] = $year;;
+            $result_json = https_request('https://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
+            //   $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
+            $result_json = json_decode($result_json);
+            if ($result_json->state == '3') {
+                if ($result_json->total < $info['price']) {
+                    return ['state' => 0, 'msg' => '今年的金额额度不够'];
+                }
+                $arr['price'] = $result_json->total;
+                $arr['uid']   = $uid;
+                RecuperateTime::create($arr);
+                return ['state' => 1, 'msg' => $result_json->msg];
+            } else {
+                return ['state' => 0, 'msg' => $result_json->msg];
             }
-        }else{
-
-                    $data['idCard']=$members_info->id_card;
-                    $data['phone']=$members_info->phone;
-                    $arr['year']=$data['year']=$year;;
-                   $result_json = https_request('https://rc.jucai.gov.cn/api/jucaiInterface/getDevelopAllowance', $data);
-                 //   $result_json = https_request('http://120.26.63.153:8080/JJRCW/api/jucaiInterface/getDevelopAllowance', $data);
-                    $result_json=json_decode($result_json);
-                    if($result_json->state=='3'){
-                        if($result_json->total<$info['price']){
-                            return  ['state'=>0,'msg'=>'今年的金额额度不够'];
-                        }
-                        $arr['price']=$result_json->total;
-                        $arr['uid']=$uid;
-                        RecuperateTime::create($arr);
-                        return ['state'=>1,'msg'=>$result_json->msg];
-                    }else{
-                        return ['state'=>0,'msg'=>$result_json->msg];
-                    }
 
         }
     }
@@ -164,44 +165,42 @@ class RecuperateController extends WebBaseController
             return $this->sendErrorResponse('身份证号格式不正确', '', 400);
         }*/
 
-        $data        = $request->all();
-        $uid = auth('web-member')->id();
-        $id_card=MemberInfo::where('uid',$uid)->value('id_card');
-        if(empty($id_card)){
-            $member_info = MemberInfo::where('id_card',$data['user_idcard'])->first();
-            if(empty($member_info)){
-                MemberInfo::where('uid',$uid)->update(['card_t_cn'=>306,'id_card'=>$data['user_idcard']]);
+        $data    = $request->all();
+        $uid     = auth('web-member')->id();
+        $id_card = MemberInfo::where('uid', $uid)->value('id_card');
+        if (empty($id_card)) {
+            $member_info = MemberInfo::where('id_card', $data['user_idcard'])->first();
+            if (empty($member_info)) {
+                MemberInfo::where('uid', $uid)->update(['card_t_cn' => 306, 'id_card' => $data['user_idcard']]);
             }
         }
         //一个活动只能报名一次
-        $recuperate_apply = RecuperateApply::where('uid',$uid)->where('recuperate_id',$data['recuperate_id'])->first();
+        $recuperate_apply = RecuperateApply::where('uid', $uid)->where('recuperate_id', $data['recuperate_id'])->first();
         if ($recuperate_apply) {
             return $this->sendErrorResponse('一个活动只能报名一次', '', 400);
         }
-        $recuperate=Recuperate::where('id',$data['recuperate_id'])->select('price')->first();
+        $recuperate = Recuperate::where('id', $data['recuperate_id'])->select('price')->first();
 
-        if(date('Y',time())!='2021'){
+        /*if(date('Y',time())!='2021'){
             $verification=$this->verification($uid,$recuperate);
             if(!$verification['state']){
                 return $this->sendErrorResponse($verification['msg'], '', 400);
             }
             $data['recuperate_time_id'] = $verification['info']->id;
-        }
-
-
-        //一人只能报两个
-/*        $count = RecuperateApply::where('uid',$uid)->count();
-        if ($count >= 2) {
-            return $this->sendErrorResponse('一人只能报两个活动', '', 400);
         }*/
 
 
+        //一人只能报两个
+        /*        $count = RecuperateApply::where('uid',$uid)->count();
+                if ($count >= 2) {
+                    return $this->sendErrorResponse('一人只能报两个活动', '', 400);
+                }*/
 
 
         //报名
-        $data['uid'] = $uid;
+        $data['uid']   = $uid;
         $data['price'] = $recuperate->price;
-        $res         = $this->recuperateApplyService->create($data);
+        $res           = $this->recuperateApplyService->create($data);
 
         if ($res) {
             return $this->sendSuccessResponse();
@@ -211,7 +210,6 @@ class RecuperateController extends WebBaseController
     }
 
 
-
     /**
      * 方案
      */

public/themes/default/views/app/recuperate/apply.blade.php

@@ -56,35 +56,41 @@
                     </tr>
                     <tr>
                         <td colspan="2" class="w1 radio_list J_radioitme_parent" style="text-align:left;padding-left:30px;">
-                            <span>&nbsp;</span>{{$members['year']}}年在晋江连续缴纳社保和个税：
-                            <div class="rli J_radioitme " href="javascript:;" style="float:right;margin-top:14px;" data-code="2">否</div>
-                            <div class="rli J_radioitme " href="javascript:;" style="float:right;margin-top:14px;" data-code="1">是</div>
-                            <input class="J_radioitme_code" name="tax" id="tax" type="hidden" value="" />
+                            <span>&nbsp;</span>人才有效期：
+                            <input name="validate_time" id="validate_time" type="text" placeholder="例如2023-11-12" value="" class="input_245_34"/>
                         </td>
                     </tr>
+                    {{--<tr>--}}
+                        {{--<td colspan="2" class="w1 radio_list J_radioitme_parent" style="text-align:left;padding-left:30px;">--}}
+                            {{--<span>&nbsp;</span>{{$members['year']}}年在晋江连续缴纳社保和个税：--}}
+                            {{--<div class="rli J_radioitme " href="javascript:;" style="float:right;margin-top:14px;" data-code="2">否</div>--}}
+                            {{--<div class="rli J_radioitme " href="javascript:;" style="float:right;margin-top:14px;" data-code="1">是</div>--}}
+                            {{--<input class="J_radioitme_code" name="tax" id="tax" type="hidden" value="" />--}}
+                        {{--</td>--}}
+                    {{--</tr>--}}
                 </table>
-                <div class="imgtitle lot2">适用对象类型</div>
-                <div class="publicsite">
-                    <div class="radio_list J_radioitme_parent">
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="1">1、海内外高等院校、科研院所或中央企业、跨国公司在我市设立的直属研发公共服务平台引进的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="2">2、落址在我市的高等院校引进的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="3">3、在我市登记注册的民营企业引进的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="4">4、2011年4月23日之后引进到我市公办医疗卫生机构工作，且优秀人才认定条件证书取得时间早于我市开具的《干部行政介绍信》；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="5">5、在我市登记注册的媒体单位（含事业单位、国有控股媒体单位）引进的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="6">6、近三年内引进到我市民办非企业单位工作的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="7">7、近三年内引进到我市本级国有股比超过50%的国有企业工作的优秀人才；</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="8">8、近三年内引进到我市依法登记的事业单位（医疗教育除外）工作的优秀人才。</div>
-                        <div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="9">9、晋江市博士后科研工作站在站博士后。</div>
-                        <input class="J_radioitme_code" name="condition" id="condition" type="hidden" value="" />
-                    </div>
-                    <div class="condition_tr J_radioitme_parent radio_list" style="margin-top:20px;display:none;">
-                        <span>&nbsp;</span>年工资是否超过130336元（计入年薪范围的包含正常工资薪金及全年一次性奖金收入，劳务报酬、利息、股息、红利所得不列入年薪范围）：
-                        <div class="rli J_radioitme" href="javascript:;" style="" data-code="1">是</div>
-                        <div class="rli J_radioitme checked" href="javascript:;" style="" data-code="2">否</div>
-                        <input class="J_radioitme_code" name="salary" id="salary" type="hidden" value="2" />
-                    </div>
-                    <div class="clear"></div>
-                </div>
+                {{--<div class="imgtitle lot2">适用对象类型</div>--}}
+                {{--<div class="publicsite">--}}
+                    {{--<div class="radio_list J_radioitme_parent">--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="1">1、海内外高等院校、科研院所或中央企业、跨国公司在我市设立的直属研发公共服务平台引进的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="2">2、落址在我市的高等院校引进的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="3">3、在我市登记注册的民营企业引进的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="4">4、2011年4月23日之后引进到我市公办医疗卫生机构工作，且优秀人才认定条件证书取得时间早于我市开具的《干部行政介绍信》；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="5">5、在我市登记注册的媒体单位（含事业单位、国有控股媒体单位）引进的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="6">6、近三年内引进到我市民办非企业单位工作的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="7">7、近三年内引进到我市本级国有股比超过50%的国有企业工作的优秀人才；</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="8">8、近三年内引进到我市依法登记的事业单位（医疗教育除外）工作的优秀人才。</div>--}}
+                        {{--<div class="rli J_radioitme condition" href="javascript:;" style="display:block;width:100%;float:none;" data-code="9">9、晋江市博士后科研工作站在站博士后。</div>--}}
+                        {{--<input class="J_radioitme_code" name="condition" id="condition" type="hidden" value="" />--}}
+                    {{--</div>--}}
+                    {{--<div class="condition_tr J_radioitme_parent radio_list" style="margin-top:20px;display:none;">--}}
+                        {{--<span>&nbsp;</span>年工资是否超过130336元（计入年薪范围的包含正常工资薪金及全年一次性奖金收入，劳务报酬、利息、股息、红利所得不列入年薪范围）：--}}
+                        {{--<div class="rli J_radioitme" href="javascript:;" style="" data-code="1">是</div>--}}
+                        {{--<div class="rli J_radioitme checked" href="javascript:;" style="" data-code="2">否</div>--}}
+                        {{--<input class="J_radioitme_code" name="salary" id="salary" type="hidden" value="2" />--}}
+                    {{--</div>--}}
+                    {{--<div class="clear"></div>--}}
+                {{--</div>--}}
                 <div class="res_add_but">
                     <div class="butlist">
                         <input type="button" id="J_saveresume"  class="but_blue_115 J_hoverbut" value="保存" />

public/themes/default/views/mobile/app/recuperate/apply.blade.php

@@ -105,7 +105,16 @@
                 <div class="arrow"></div>
                 <div class="clear"></div>
             </div>
-            <div class="plist-txt notarrow" style="border-bottom: 1px #F2F2F2 solid;box-sizing:border-box;padding:.2rem .4rem;">
+            <div class="list_height plist-txt notarrow">
+                <div class="pic"></div>
+                <div class="tit font14">人才有效期</div>
+                <div class="describe font12">
+                    <input id="validate_time" type="text"  name="validate_time" value=""  placeholder="例如2023-11-12">
+                </div>
+                <div class="arrow"></div>
+                <div class="clear"></div>
+            </div>
+            {{--<div class="plist-txt notarrow" style="border-bottom: 1px #F2F2F2 solid;box-sizing:border-box;padding:.2rem .4rem;">
                 <div class="tit font14" style="width:100%;text-align:center;border:none;float:none;">{{$members['year']}}年在晋江连续缴纳社保和个税</div>
                 <div style="display:flex;justify-content: center;">
                     <div class="radio-cell" style="position:relative;width:1rem;">
@@ -189,7 +198,7 @@
                 </div>
                 <div class="arrow"></div>
                 <div class="clear"></div>
-            </div>
+            </div>--}}
         </form>
         <div class="split-block"></div>
         <div class="btn-spacing"><a id="loginBtn" href="javascript:;" class="qs-btn qs-btn-blue font18">提交</a></div>