编辑导出选项

app/admin/controller/Talent.php

@@ -1651,7 +1651,7 @@ class Talent extends AdminController {
         $fields = $params["export"];
         if (!$fields)
             return json(["msg" => "请选择要导出的数据"]);
-        $names = DictApi::getTalentFields(4);
+        $names = DictApi::getTalentFields(4, in_array("isMatchZhiren", $fields));
         $names["industryFieldNew"] = "产业领域";
         $names["enterpriseName"] = "单位名称";
         $names["enterpriseTag"] = "单位标签";

app/admin/view/talent/dept_verify.html

@@ -324,8 +324,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -340,17 +343,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/fst_verify.html

@@ -402,8 +402,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -418,17 +421,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/library.html

@@ -402,8 +402,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -418,17 +421,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/pre_list.html

@@ -612,8 +612,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -628,17 +631,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/re_verify.html

@@ -329,8 +329,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -345,17 +348,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/common/api/VerifyApi.php

@@ -508,6 +508,9 @@ class VerifyApi {
         $sex = [1 => "男", 2 => "女"];
         $pre_import_type = [1 => "意向合同", 2 => "创业企业名称预核准"];
         $study_abroad = [1 => "是", 2 => "否"];
+        $salary_pay_way = [1 => "本单位", 2 => "本单位所属集团公司及权属公司"];
+        $return = [1 => "是", 2 => "否"];
+        $isMatchZhiren = [0 => "否", 1 => "是"];
 
         $where = [];
         $where[] = ["e.type", "=", session("user")["type"]];
@@ -556,7 +559,10 @@ class VerifyApi {
             $item["sex"] = $sex[$item["sex"]];
             $item["highest_degree"] = $highest_degree[$item["highest_degree"]];
             $item["import_way"] = $import_way[$item["import_way"]];
+            $item["salary_pay_way"] = $salary_pay_way[$item["salary_pay_way"]];
             $item["pre_import_type"] = $pre_import_type[$item["pre_import_type"]];
+            $item["return"] = $return[$item["return"]];
+            $item["isMatchZhiren"] = $isMatchZhiren[$item["isMatchZhiren"]];
             $item["study_abroad"] = $study_abroad[$item["study_abroad"]];
             $item["source"] = $source[$item["source"]];
             $item["talent_arrange"] = $talent_arrange[$item["talent_arrange"]];