浏览代码

更新接口

sandm 1 年之前
父节点
当前提交
91d1e1eff9

+ 29 - 4
app/admin/api/DataApi.php

@@ -49,7 +49,7 @@ class DataApi{
         }
     }
 
-    public function InsuranceRecordSearch(){
+    public function getClient($url){
         $this->getGuid();
         $options = [
             'cache_wsdl'     => WSDL_CACHE_NONE,
@@ -65,12 +65,12 @@ class DataApi{
             )
         ];
 
-        $client = new \SoapClient("http://110.88.153.177:802/ConvergenceServiceBoot/webservice/InsuranceRecordSearch?wsdl", $options);
+        $client = new \SoapClient($url, $options);
         return $client;
     }
 
     public function queryUnemploymentInsuranceByIdAndTime($card,$start,$end){
-        $client = $this->InsuranceRecordSearch();
+        $client = $this->getClient("http://110.88.153.177:802/ConvergenceServiceBoot/webservice/InsuranceRecordSearch?wsdl");
         $param = [
             'guid' => $this->guid,
             'requestid' => 'null_00001',
@@ -89,7 +89,7 @@ class DataApi{
     }
 
     public function queryOldAgeSecurityInsuranceByIdAndTime($card,$start,$end){
-        $client = $this->InsuranceRecordSearch();
+        $client = $this->getClient("http://110.88.153.177:802/ConvergenceServiceBoot/webservice/InsuranceRecordSearch?wsdl");
         $param = [
             'guid' => $this->guid,
             'requestid' => 'null_00001',
@@ -106,4 +106,29 @@ class DataApi{
             return false;
         }
     }
+
+    public function queryJfhbxxByYears($card,$name,$years){
+        $client = $this->getClient("http://110.88.153.177:802/ConvergenceServiceBoot/webservice/CityBrain?wsdl");
+        $param = [
+            'guid' => $this->guid,
+            'requestid' => 'null_00001',
+            'reason' => "测试",
+            'optIDCard' => "350582199006028550",
+            'optName' => "郑明炜",
+            'optIp' => get_client_ip(),
+            'optMac' => "00-D8-61-73-14-EC",
+            'IDCard' => $card,
+            'name' => $name,
+            'years' => $years
+        ];
+
+        $rst = $client->queryJfhbxxByYears($param);
+        $ret = json_decode($rst->return, true);
+        $ret = json_decode($ret, true);
+        if($ret['code'] == '01'){
+            return $ret;
+        }else{
+            return false;
+        }
+    }
 }

+ 1 - 1
app/admin/controller/TalentTypeChange.php

@@ -30,7 +30,7 @@ class TalentTypeChange extends AdminController {
                 $tpl = "talentTypeChange_library";
                 break;
         }
-        dd($tpl);
+
         return view($tpl);
     }
 }

+ 255 - 0
app/admin/view/talent_type_change/talentTypeChange_first.html

@@ -0,0 +1,255 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-top:1px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>人才层次变更管理</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="talentName" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterpriseName">
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">原申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="oldYear" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            原人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="oldTalentArrange">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            原认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="oldIdentifyCondition">
+                                        <option value="">--请选择--</option>
+                                        {volist name="talent_conditions" id="condition"}
+                                        <option value="{$condition.id}">{$condition.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">原公布入选月份
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control time" id="oldIdentifyMonth" name="oldIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="newYear" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            新人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="newTalentArrange">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            新认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="newIdentifyCondition">
+                                        <option value="">--请选择--</option>
+                                        {volist name="talent_conditions" id="condition"}
+                                        <option value="{$condition.id}">{$condition.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <div class="input-group">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新公布入选月份
+                                        </button>
+                                    </div>
+                                    <input type="text" time="time" formate="date" class="form-control" id="newIdentifyMonth" name="newIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">审核状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="checkState">
+                                        <option value="">---请选择---</option>
+                                        <!--<option value="-1">保存未提交</option>
+                                        <option value="5">重新提交</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">审核驳回</option>
+                                        <option value="3">审核通过</option>
+                                        <option value="4">审核不通过</option>-->
+                                        <option value="1">保存未提交</option>
+                                        <option value="2">初审驳回</option>
+                                        <option value="3">待初审(首次提交)</option>
+                                        <option value="4">待初审(重新提交)</option>
+                                        {if condition="in_array($type,[1])"}
+                                        <option value="5">待初审(部门并审驳回)</option>
+                                        {/if}
+                                        <option value="6">待初审(复审驳回)</option>
+                                        {if condition="in_array($type,[1])"}
+                                        <option value="7">初审通过(待部门并审)</option>
+                                        {/if}
+                                        <option value="8">初审通过(待复审)</option>
+                                        <option value="9">初审不通过</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isPublic">
+                                        <option value="">---请选择---</option>
+                                        <option value="1">待核查征信</option>
+                                        <option value="2">待公示</option>
+                                        <option value="3">公示中</option>
+                                        <option value="4">待公布</option>
+                                        <option value="5">待发证</option>
+                                        <option value="6">已发证</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentTypeChange.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentTypeChange.reset()">重置</button>
+                            </div>
+
+                        </div>
+                        <div class="hidden-xs" id="TalentTypeChangeTableToolbar" role="group">
+                            {if condition="chkCommission('/admin/talentTypeChange/firstCheck','/talentTypeChange/firstCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.openTalentTypeChangeCheck()" id="">
+                                <i class="fa fa-check"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentTypeChange/firstExport','/talentTypeChange/firstExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.showExportModal(1)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('','/talentTypeChange/firstDownload')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.download()" id="">
+                                <i class="fa fa-download"></i>&nbsp;下载
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentTypeChange/updateFieldsAndFiles','/talentTypeChange/updateFieldsAndFiles')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.updateFieldsAndFiles()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/getPhones','')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.getPhones()" id="">
+                                <i class="fa fa-mobile"></i>&nbsp;获取人才手机号
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/getEnterprisePhones','')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.getEnterprisePhones()" id="">
+                                <i class="fa fa-phone"></i>&nbsp;获取人才联络员手机号
+                            </button>
+                            {/if}
+                        </div>
+                        <table id="TalentTypeChangeTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                            <tr>
+                                <th data-field="selectItem" data-checkbox="true"></th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_first.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentLibrary/talentTypeChange/talentTypeChange_first.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

+ 58 - 11
app/job/Jjhc.php

@@ -50,22 +50,29 @@ class Jjhc {
                     $res = $dataapi->queryUnemploymentInsuranceByIdAndTime($datas[$index][3],'202201','202301');
                     if($res){
                         $i = 0;
-                        foreach ($res['data'] as $k => $v){
-                            if(strpos($v['AAB069'],"晋华") !== false || strpos($v['AAB069'],"渠梁") !== false){
-                                $i++;
+                        $months = [];
+                        if(count($res['data']) > 0){
+                            foreach ($res['data'] as $k => $v){
+                                if(strpos($v['AAB069'],"晋华") !== false || strpos($v['AAB069'],"渠梁") !== false){
+                                    $i++;
+                                    array_push($months,$v['AAE003']);
+                                }
                             }
+                            sort($months);
+                            $res_str = "2022年共缴费{$i}个月,分别是:".implode('、',$months);
+                        }else{
+                            $res_str = "2022年共缴费0个月";
                         }
-                        $res_str = "2022年共缴费{$i}个月";
                         echo "第". ($index + 1) . "失业险整理完毕,姓名:{$datas[$index][1]},".$res_str."\r\n";
                         $sheet->setCellValue('F' . ($index+1), $res_str);
                     }
-                    sleep(5);
+                    sleep(2);
                 }
                 $writer->save($path . "/test.xlsx");
                 return false;
                 break;
             case '2':
-
+                return false;
                 $path = dirname(dirname(dirname(__FILE__)));
                 $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($path . "/test.xlsx");
                 $sheet = $spreadsheet->getSheet(0);
@@ -74,15 +81,22 @@ class Jjhc {
                 $dataapi = new DataApi();
                 for ($index = 0; $index < count($datas); $index++) {
                     echo "正在查询第" . ($index+1) . "人({$datas[$index][3]})的养老险\r\n";
-                    $res = $dataapi->queryOldAgeSecurityInsuranceByIdAndTime($datas[$index][3],'202201','202301');
+                    $res = $dataapi->queryOldAgeSecurityInsuranceByIdAndTime($datas[$index][3],'202201','202212');
                     if($res){
                         $i = 0;
-                        foreach ($res['data'] as $k => $v){
-                            if(strpos($v['AAB004'],"晋华") !== false || strpos($v['AAB004'],"渠梁") !== false){
-                                $i++;
+                        $months = [];
+                        if(count($res['data']) > 0){
+                            foreach ($res['data'] as $k => $v){
+                                if(strpos($v['AAB004'],"晋华") !== false || strpos($v['AAB004'],"渠梁") !== false){
+                                    $i++;
+                                    array_push($months,$v['AAE003']);
+                                }
                             }
+                            sort($months);
+                            $res_str = "2022年共缴费{$i}个月,分别是:".implode('、',$months);
+                        }else{
+                            $res_str = "2022年共缴费0个月";
                         }
-                        $res_str = "2022年共缴费{$i}个月";
                         echo "第". ($index + 1) . "养老险整理完毕,姓名:{$datas[$index][1]},".$res_str."\r\n";
                         $sheet->setCellValue('E' . ($index+1), $res_str);
                     }
@@ -91,6 +105,39 @@ class Jjhc {
                 $writer->save($path . "/test.xlsx");
                 return false;
                 break;
+            case '3':
+                $path = dirname(dirname(dirname(__FILE__)));
+                $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($path . "/test1.xlsx");
+                $sheet = $spreadsheet->getSheet(0);
+                $datas = $sheet->toArray();
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
+                $dataapi = new DataApi();
+                for ($index = 0; $index < count($datas); $index++) {
+                    echo "正在查询第" . ($index+1) . "人({$datas[$index][3]})的医保\r\n";
+                    $res = $dataapi->queryJfhbxxByYears($datas[$index][3],$datas[$index][1],'2022');
+                    if($res){
+                        $i = 0;
+                        $months = [];
+                        if(count($res['datalist']) > 0){
+                            foreach ($res['datalist'] as $k => $v){
+                                if( $v['aae140'] == '310'){
+                                    $i++;
+                                    array_push($months,$v['zmny00']);
+                                }
+                            }
+                            sort($months);
+                            $res_str = "2022年共缴费{$i}个月,分别是:".implode('、',$months);
+                        }else{
+                            $res_str = "2022年共缴费0个月";
+                        }
+                        echo "第". ($index + 1) . "医保整理完毕,姓名:{$datas[$index][1]},".$res_str."\r\n";
+                        $sheet->setCellValue('E' . ($index+1), $res_str);
+                    }
+                    sleep(2);
+                }
+                $writer->save($path . "/test1.xlsx");
+                return false;
+                break;
             default:
                 return false;
 

+ 2 - 2
public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js

@@ -88,14 +88,14 @@ TalentTypeChange.getIdentifyCondition = function(type) {
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/identifyCondition/findIdentifyConditionByLevel"
+        "url": "/common/api/findIdentifyConditionByLevel"
     });
     Feng.addAjaxSelect({
         "id": "newIdentifyCondition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/identifyCondition/findIdentifyConditionByLevel"
+        "url": "/common/api/findIdentifyConditionByLevel"
     });
     $("#oldIdentifyCondition,#newIdentifyCondition").trigger('chosen:updated');
 }