部门审核状态修正

app/admin/controller/Talent.php

@@ -57,7 +57,7 @@ class Talent extends AdminController {
                 TalentModel::update($data);
                 $counts++;
             } else {
-                //return json(["msg" => "不在审核范围"]);
+                return json(["msg" => "不在审核范围"]);
             }
         }
         return json(["code" => 200, sprintf("%d个申请已审核失败", $counts)]);
@@ -379,28 +379,29 @@ class Talent extends AdminController {
             return json(["msg" => "您的部门已经审核过了"]);
 
         $over++;
-        if ($dept_log["new_state"] == TalentState::DEPT_VERIFY_REJECT) {
+        if ($dept_log["new_state"] == TalentState::SCND_SUBMIT) {
             $error++;
         }
         $logs = TalentLogApi::getListLogByTime($talent_info["id"], $talent_info["first_dept_check_time"]);
         for ($i = 0; $i < count($logs); $i++) {
             $over += $logs[$i]["active"] == 1 ? 1 : 0;
-            if ($logs["new_state"] == TalentState::DEPT_VERIFY_REJECT) {
+            if ($logs["new_state"] == TalentState::SCND_SUBMIT) {
                 $error++;
             }
         }
         if ($over == count($companys)) {
             //全部已审核
-            $checkState = TalentState::DEPT_VERIFY_REJECT;
+            $checkState = TalentState::SCND_SUBMIT;
+            $log_checkState = TalentState::DEPT_VERIFY_REJECT;
             if ($error == 0) {
-                $checkState = TalentState::DEPT_VERIFY_PASS;
+                $log_checkState = $checkState = TalentState::DEPT_VERIFY_PASS;
                 $data["highProcess"] = $nowProcess > $talent_info["highProcess"] ? $nowProcess : $talent_info["highProcess"];
             }
             $data["id"] = $talent_info["id"];
             $data["checkState"] = $checkState;
             $data["first_dept_check_time"] = null;
             TalentModel::update($data);
-            TalentLogApi::write(1, $talent_info["id"], $checkState, "部门审核结束", 1);
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], "部门审核结束", 1);
         }
         TalentLogApi::setActive($dept_log["id"], 1);
         return json(["code" => 200, "msg" => "审核成功"]);

app/common/api/DictApi.php

@@ -198,10 +198,12 @@ class DictApi {
     public static function getTalentInfoStepByState($state) {
         $stepName = "";
         switch ($state) {
+            case -1:
             case 3:
             case 4:
-                $stepName = '<span class="label">"基本条件判定"</span>';
+                $stepName = '<span class="label">基本条件申报</span>';
                 break;
+            case -2:
             case 7:
             case 8:
                 $stepName = '<span class="label label-primary">初级审核</span>';
@@ -228,7 +230,7 @@ class DictApi {
         $str = "";
         switch ($state) {
             case -2:
-                $str = '<span class="label label-danger">初审审核失败</span>';
+                $str = '<span class="label label-danger">初审失败</span>';
                 break;
             case -1:
                 $str = '<span class="label label-danger">基础信息审核失败</span>';

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

@@ -62,6 +62,12 @@ TalentInfo.initColumn = function () {
                     }
                 } else {
                     switch (value) {
+                        case - 2:
+                            return "<span class='label label-danger'>初审失败</span>";
+                            break;
+                        case - 1:
+                            return "<span class='label label-danger'>基础条件审核失败</span>";
+                            break;
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             break;

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

@@ -63,6 +63,12 @@ TalentInfo.initColumn = function () {
                     }
                 } else {
                     switch (value) {
+                        case -2:
+                            return "<span class='label label-danger'>初审失败</span>";
+                            break;
+                        case -1:
+                            return "<span class='label label-danger'>基础条件审核失败</span>";
+                            break;
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             break;
@@ -79,7 +85,6 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待初审</span>";
                             break;
                         case 7:
-                            console.log(2);
                             if (row.companyIds) {
                                 return "<span class='label label-success'>待部门审核</span>";
                             } else {