1

app/admin/controller/Talent.php

@@ -1246,6 +1246,33 @@ class Talent extends AdminController {
                         $where[] = ["type", "=", $enterprise["type"]];
 
                         $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                        /* foreach ($files as $key => $file) {
+                          $options = array_filter(explode(",", $file["option"]));
+                          if ($options) {
+                          switch ($file["rel"]) {
+                          case "talent_type":
+                          $allow_tags = array_filter(explode(",", $file["enterprise_tag"]));
+                          if ($allow_tags && !in_array($enterprise["enterpriseTag"], $allow_tags)) {
+                          unset($files[$key]);
+                          break;
+                          }
+                          if (!in_array($talent_info["talent_type"], $options)) {
+                          unset($files[$key]);
+                          break;
+                          }
+                          break;
+                          case "birthday":
+                          $birthYear = substr($talent_info["birthday"], 0, 4);
+                          $currentYear = date("Y");
+                          $age = $currentYear - $birthYear;
+                          if ($age < $options[0]) {
+                          unset($files[$key]);
+                          break;
+                          }
+                          break;
+                          }
+                          }
+                          } */
                         $process = 1;
                         break;
                     case TalentState::BASE_VERIFY_PASS:
@@ -1340,6 +1367,10 @@ class Talent extends AdminController {
         $this->commonExport(1);
     }
 
+    public function baseReverifyListExport() {
+        $this->commonExport(2);
+    }
+
     public function fstVerifyListExport() {
         $this->commonExport(3);
     }

app/common/api/DictApi.php

@@ -210,12 +210,12 @@ class DictApi {
             case -1:
             case 3:
             case 4:
-                $stepName = '<span class="label label-primary">基础条件审核</span>';
+                $stepName = '<span class="label label-primary">基础信息审核</span>';
                 break;
             case 5:
             case 6:
             case 7:
-                $stepName = '<span class="label label-primary">基础条件复审</span>';
+                $stepName = '<span class="label label-primary">基础信息复审</span>';
                 break;
             case -2:
             case 10:
@@ -267,36 +267,39 @@ class DictApi {
                 $str = '<span class="label label-danger">初审失败</span>';
                 break;
             case -1:
-                $str = '<span class="label label-danger">基础条件审核失败</span>';
+                $str = '<span class="label label-danger">基础信息审核失败</span>';
                 break;
             case 1:
                 if ($last_state > $state) {
-                    $str = '<span class="label label-danger">基础条件审核驳回</span>';
+                    $str = '<span class="label label-danger">基础信息审核驳回</span>';
                 } else {
-                    $str = '<span class="label">待提交基础条件</span>';
+                    $str = '<span class="label">待提交基础信息</span>';
                 }
                 break;
             case 2:
-                if ($last_state > $state) {
-                    $str = '<span class="label label-success">待重审</span>';
+                /* if ($last_state > $state) {
+                  $str = '<span class="label label-success">待重审</span>';
+                  } else */
+                if ($last_state == 3) {
+                    $str = '<span class="label label-danger">基础信息复审驳回</span>';
                 } else {
                     $str = '<span class="label label-success">待审核</span>';
                 }
                 break;
             case 3:
-                $str = '<span class="label label-primary">基础条件审核通过</span>';
+                $str = '<span class="label label-primary">基础信息审核通过</span>';
                 break;
             case 4:
-                $str = '<span class="label">再提交基础条件</span>';
+                $str = '<span class="label">再提交基础信息</span>';
                 break;
             case 5:
-                $str = '<span class="label label-primary">基础条件复审通过</span>';
+                $str = '<span class="label label-primary">基础信息复审通过</span>';
                 break;
             case 6:
-                $str = '<span class="label label-danger">基础条件复审驳回</span>';
+                $str = '<span class="label label-danger">基础信息复审驳回</span>';
                 break;
             case 7:
-                $str = '<span class="label label-danger">基础条件复审失败</span>';
+                $str = '<span class="label label-danger">基础信息复审失败</span>';
                 break;
             case 8:
                 if ($last_state > $state) {

app/common/api/VerifyApi.php

@@ -261,7 +261,7 @@ class VerifyApi {
             return self::getDeptList($params, $where);
         }
         if ($process == 5) {
-            $whereRaw = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
+            $whereRaw = sprintf("(ti.checkState in (14,15,16)) or (ti.checkState=12 and ti.pass_dept_check=0) or (ti.checkState=10 and ti.pass_dept_check=1) or (ti.checkState=10 and (tc.companyIds is null or tc.companyIds = ''))");
             switch ($params["checkState"]) {
                 case 1:
                     $where[] = ["ti.checkState", "in", [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS]];
@@ -291,8 +291,7 @@ class VerifyApi {
                     $where[] = ["ti.checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                     break;
                 case 2:
-                    //等完善
-                    $where[] = ["ti.checkState", "in", [TalentState::BASE_VERIFY_PASS]];
+                    $where[] = ["ti.checkState", "in", [TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_FAIL]];
                     break;
                 case 3:
                     switch ($params["checkState"]) {
@@ -410,7 +409,7 @@ class VerifyApi {
                 $where = "ti.checkState in (" . TalentState::FST_SUBMIT . "," . TalentState::BASE_VERIFY_FAIL . ")";
                 break;
             case 2:
-                //待完善
+                $where = "ti.checkState in (" . TalentState::BASE_VERIFY_PASS . "," . TalentState::BASE_REVERIFY_FAIL . ")";
                 break;
             case 3:
                 $where = "ti.checkState in (" . TalentState::SCND_SUBMIT . "," . TalentState::FST_VERIFY_FAIL . ")";
@@ -477,7 +476,7 @@ class VerifyApi {
                 $where[] = ["ti.checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                 break;
             case 2:
-                //待完善
+                $where[] = ["ti.checkState", "in", [TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_FAIL]];
                 break;
             case 3:
                 $where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];

app/common/controller/Api.php

@@ -154,7 +154,7 @@ class Api extends BaseController {
                     $new_item["stepName"] = DictApi::getCheckLogStepName($item["state"], $item["step"]);
                     if (in_array($item["state"], [TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL])) {
                         $new_item["stateName"] = '<span class="label label-danger">审核不通过</span>';
-                    } else if (in_array($item["state"], [TalentState::BASE_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS])) {
+                    } else if (in_array($item["state"], [TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS])) {
                         if ($item["step"] == 3) {
                             if ($item["new_state"] == TalentState::SCND_SUBMIT) {
                                 $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
@@ -166,7 +166,7 @@ class Api extends BaseController {
                         } else {
                             $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
                         }
-                    } else if (in_array($item["state"], [TalentState::BASE_REJECT, TalentState::FST_VERIFY_REJECT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT])) {
+                    } else if (in_array($item["state"], [TalentState::BASE_REJECT, TalentState::BASE_REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT])) {
                         $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
                     } else if (in_array($item["state"], [TalentState::ZX_PASS, TalentState::ANNOUNCED, TalentState::ANNOUNCED_REVERIFY_PASS, TalentState::PUBLISH_PASS, TalentState::CERTIFICATED])) {
                         $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';

app/enterprise/controller/Base.php

@@ -154,7 +154,7 @@ class Base extends EnterpriseController {
                 $upload_type_counts = count($distinct_filetypes);
             }
             if ($upload_type_counts != count($ft_ids)) {
-                $res = ["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核" . count($ft_ids)];
+                $res = ["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"];
                 echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
                 exit;
             }

app/enterprise/controller/Talent.php

@@ -147,7 +147,7 @@ class Talent extends EnterpriseController {
             $where[] = ["delete", "=", 0];
             $where[] = ["isConditionFile", "<>", 1];
             if ($whr) {
-                $filetypes = Db::table("new_common_filetype")->where([$where, $whr])->select()->toArray();
+                $filetypes = Db::table("new_common_filetype")->whereOr([$where, $whr])->select()->toArray();
             } else {
                 $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
             }
@@ -164,7 +164,6 @@ class Talent extends EnterpriseController {
             $whr[] = ["mainId", "=", $id];
             $distinct_filetypes = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->select();
             $upload_type_counts = count($distinct_filetypes);
-
             if ($upload_type_counts != count($ft_ids)) {
                 $res = ["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"];
                 echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
@@ -246,7 +245,7 @@ class Talent extends EnterpriseController {
                 $data["annual_salary"] = null;
             }
 
-            if ($info["real_state"] == 8) {
+            if ($info["real_state"] == TalentState::FST_VERIFY_REJECT) {
                 //真实状态8是驳回，需要判断什么字段可以提交                
                 $modify_fields = array_filter(explode(",", $info["modify_fields"]));
                 $tmp_data = $data;

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -837,7 +837,7 @@ TalentInfoInfoDlg.submitCallback = function (data) {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 8) {
+    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 5 && checkState != 8) {
         if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -790,7 +790,7 @@ TalentInfoInfoDlg.submitCallback = function (data) {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 8) {
+    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 5 && checkState != 8) {
         if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
@@ -822,7 +822,8 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     files = files.split(",");
     var checkState = $("#checkState").val();
     var realState = $("#realState").val();
-    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 8 && realState != 11) || (realState == 8 && files.indexOf(fileTypeId.toString()) != -1)) {
+    console.log(checkState,realState);
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 5 && realState == 5) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +
@@ -884,7 +885,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
     var realState = $("#realState").val();
-    if (realState == 8) {
+    if (realState == 11) {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
@@ -1121,6 +1122,10 @@ $(function () {
         });
     }
     TalentInfoInfoDlg.initFileTable();
+    var is_abroad = $("#study_abroad").val();
+    if (is_abroad == "1") {
+        TalentInfoInfoDlg.changeStudyAbroad();
+    }
 });
 
 

public/static/modular/talentIdentify/talentInfo/talentInfo_base.js

@@ -55,8 +55,14 @@ TalentInfo.initColumn = function () {
                         if (row.lastState == 4) {
                             return "<span class='label label-success'>待审核（重新提交）</span>"
                         }
+                        if (row.realState == 6) {
+                            return "<span class='label label-danger'>复审驳回</span>"
+                        }
                         return "<span class='label label-success'>待审核</span>"
                     }
+                    if (value == 3) {
+                        return "<span class='label label-success'>待复审</span>"
+                    }
                     if (value == 5) {
                         return "<span class='label label-success'>复审通过</span>"
                     }
@@ -67,7 +73,7 @@ TalentInfo.initColumn = function () {
                         if (row.realState == 13) {
                             return "<span class='label label-danger'>部门驳回</span>"
                         } else if (row.realState == 15) {
-                            return "<span class='label label-danger'>复核驳回</span>"
+                            return "<span class='label label-danger'>复审驳回</span>"
                         } else {
                             if (row.lastState == 11) {
                                 return "<span class='label label-success'>待审核（重新提交）</span>"
@@ -75,7 +81,7 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待审核</span>"
                         }
                     }
-                    if (value == 16 || value == -1 || value == -2) {
+                    if (value == 16 || value == -1 || value == -2 || value == 7) {
                         return "<span class='label label-danger'>审核不通过</span>"
                     }
                     if (value == 4) {