Merge branch 'develop' of zhengxifeng/zc100 into master

application/api/controller/Diyajax.php

@@ -176,9 +176,9 @@ class Diyajax extends Base
     public function getZcDjList(){
 
          $name = [
-             '技术员职称',
-             '助理职称',
-             '中级职称',
+             '技术员',
+             '助理工程师',
+             '中级工程师',
              '副高级职称',
              '正高级职称'
          ];
@@ -273,12 +273,52 @@ class Diyajax extends Base
         $param = request()->param();
         $param['id'] = (int)$param['id']; //职称ID
         $param['xl'] = (int)$param['xl']; //学历
+        $param['dj'] = (int)$param['dj']; //等级
+
+/*        $param['id'] = 18; //职称ID
+        $param['xl'] = 3; //学历
+        $param['dj'] = 18; //等级*/
 
         if(!empty($param['id'])){
-            $map_ids = Db::name('zc_zs')
+
+            //查找专业绑定的证书
+            /*$map_ids = Db::name('zc_zs')
                 ->where('zc_id', $param['id'])
                 ->where('is_del', 0)
-                ->column('map_id');
+                ->column('map_id');*/
+
+            //查找规则 是否有相关证书要求
+            $zc_list_ids = Db::name('zcwd_position')
+                ->where('type', $param['id'])  //职称id
+                ->where('sbdj', $param['dj'])   //等级id
+                ->column('id');
+
+            //var_dump($zc_list_ids);
+
+            $xl_list_ids = Db::name('zcwe_position')
+                ->where('type','in',$zc_list_ids) //注规则
+                ->where('xlyq', $param['xl'])  //学历要求符合的
+                ->column('id');
+
+            //var_dump($xl_list_ids);
+
+
+            $map_list = Db::name('zcwf_position')
+                ->field('id,zhengshu')
+                ->where('type_son', 'in',$xl_list_ids)
+                ->select();
+
+            //var_dump($map_list);
+
+            $map_ids = [];
+            foreach ($map_list as $k=>$v){
+                if(!empty($v['zhengshu'])){
+                    $zhengshu = json_decode($v['zhengshu'],true);
+                    foreach ($zhengshu as $k1=>$v1){
+                        $map_ids[] = (int)$v1;
+                    }
+                }
+            }
 
             //调用等级
             $list = Db::name('zczs_position')
@@ -432,9 +472,9 @@ class Diyajax extends Base
 
 
         $name = [
-            1000000001=>'技术员职称',
-            1000000002=>'助理职称',
-            1000000003=>'中级职称',
+            1000000001=>'技术员',
+            1000000002=>'助理工程师',
+            1000000003=>'中级工程师',
             1000000004=>'副高级职称',
             1000000005=>'正高级职称'
         ];

application/api/model/v1/Zc.php

@@ -472,7 +472,7 @@ class Zc extends Base{
                 'type'        => $gid, //所属职称主规则id
                 'type_son'        => $xid, //所属上级学历id
                 'is_zs' => 1,
-                'zhengshu' => json_encode([$sid]),
+                'zhengshu' => json_encode([(int)$sid]),
                 'sjnx' => json_encode([$rowData[0][9]]),
             ])->find();
         if($oen){
@@ -503,7 +503,7 @@ class Zc extends Base{
                 'bysj' =>0,
                 'bysj_time' => 0,
                 'is_zs' => 1,
-                'zhengshu' => json_encode([$sid]),
+                'zhengshu' => json_encode([(int)$sid]),
                 'sjnx' => json_encode([$rowData[0][9]]),
                 'gzyq' => json_encode([]),
                 'qttj' => '',

template/pc/components/index/step.htm

@@ -545,7 +545,7 @@
 
                                 <?php
                                 //下载文件地址
-                                if(strpos($extend_info['sbdj'],'高级') !== false){
+                                if(strpos($extend_info['sbdj'],'中级') !== false){
                                     $base_url = './uploads/pdf/2/';
                                     $map_area = ['吉林','内蒙古','新疆','天津','陕西','山东'];
                                     $map_file = [

template/pc/js/botstrap-step/scripts.js

@@ -176,6 +176,7 @@ jQuery(document).ready(function() {
             }
 
             var xl = $('#choose5').val();
+            var dj = $('#choose3').val();
 
             //调用证书
             $('#loadingModal').modal('show');
@@ -185,6 +186,7 @@ jQuery(document).ready(function() {
                 dataType: 'json', // 指定响应数据为JSON
                 data: {
                     id: a,
+                    dj: dj,
                     xl: xl,
                 },
                 success: function (data) {