旧表过来电路人才兼容处理（显示过往日志、可继续审核）

app/admin/controller/Talent.php

@@ -30,7 +30,7 @@ class Talent extends AdminController {
         $request = $this->request;
         $params = $request->param();
         $id = $params["id"];
-        $info = VerifyApi::getTalentInfoById($id,true);
+        $info = VerifyApi::getTalentInfoById($id, true);
         if (in_array($info["checkState"], [TalentState::BASE_VERIFY_FAIL, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
@@ -806,9 +806,9 @@ class Talent extends AdminController {
             $log_checkState = TalentState::FST_VERIFY_REJECT; //日志记录拒绝状态
         }
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
-        if (!$log)
+        if (!$log && !$talent_info["oldId"])
             return json(["msg" => "日志数据异常,保存失败"]);
-        if ($log["active"] == 0) {
+        if ($log["active"] === 0) {
             TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
         } else {
             TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
@@ -1039,9 +1039,9 @@ class Talent extends AdminController {
             $log_checkState = $checkState = TalentState::REVERIFY_FAIL; //审核失败
         }
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
-        if (!$log)
+        if (!$log && !$talent_info["oldId"])
             return json(["msg" => "日志数据异常,保存失败"]);
-        if ($log["active"] == 0) {
+        if ($log["active"] === 0) {
             TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
         } else {
             TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);

app/common/api/DictApi.php

@@ -438,6 +438,84 @@ class DictApi {
         return $str;
     }
 
+    public static function getOldStateNameByState($state) {
+        switch ($state) {
+            case -2:
+                return "<span class='label label-success'>待提交</span>";
+            case -1:
+                return "<span class='label label-success'>审核不通过</span>";
+            case 1:
+                return "<span class='label label-success'>待审核</span>";
+            case 2:
+                return "<span class='label label-danger'>审核驳回</span>";
+            case 3:
+                return "<span class='label label-primary'>审核通过</span>";
+            case 4:
+                return "<span class='label label-warm'>上级驳回</span>";
+            case 10:
+                return "<span class='label label-default'>冻结</span>";
+            case 8:
+                return "<span class='label label-primary'>提交审核</span>";
+            case 11:
+                return "<span class='label label-primary'>撤销审核</span>";
+            case 9:
+                return "<span class='label label-primary'>重新提交</span>";
+            default:
+                return "";
+        }
+    }
+
+    public static function getOldStepNameByStep($step) {
+        switch ($step) {
+            case -1:
+                return "<span class='label label-primary'>部门初审</span>";
+            case 0:
+                return "<span class='label'>用户操作</span>";
+            case 1:
+                return "<span class='label label-primary'>初级审核</span>";
+            case 2:
+                return "<span class='label label-success'>部门审核</span>";
+            case 3:
+                return "<span class='label label-danger'>复核</span>";
+            case 4:
+                return "<span class='label label-warning'>核查征信</span>";
+            case 5:
+                return "<span class='label label-warning'>公示</span>";
+            case 6:
+                return "<span class='label label-success'>公示再审核</span>";
+            case 7:
+                return "<span class='label label-warning'>公布</span>";
+            case 8:
+                return "<span class='label label-info'>发证</span>";
+            case 11:
+                return "<span class='label label-danger'>审核</span>";
+            case 12:
+                return "<span class='label label-primary'>撤回审核</span>";
+            case 20:
+                return "<span class='label label-success'>人才层次变更</span>";
+            case 21:
+                return "<span class='label label-success'>工作单位变更</span>";
+            case 22:
+                return "<span class='label label-success'>离职变更</span>";
+            case 23:
+                return "<span class='label label-success'>银行账号变更</span>";
+            case 24:
+                return "<span class='label label-success'>基础信息变更</span>";
+            case 50:
+                return "<span class='label label-primary'>兑现</span>";
+            case 55:
+                return "<span class='label label-primary'>撤销公布</span>";
+            case 60:
+                return "<span class='label label-primary'>取消优秀人才</span>";
+            case 65:
+                return "<span class='label label-primary'>恢复优秀人才</span>";
+            case 70:
+                return "<span class='label label-danger'>设置审核不通过</span>";
+            default:
+                return "";
+        }
+    }
+
     public static function findByParentCodeAndCode($parentCode, $code) {
         $parent_info = Dict::where('code', $parentCode)->findOrEmpty();
         if ($parent_info) {

app/common/controller/Api.php

@@ -258,12 +258,32 @@ class Api extends BaseController {
                 $where = [];
                 $where[] = ["name", "=", $name];
                 $user = \app\admin\model\User::where($where)->find();
-                $account = $user ? $user["account"] : "tmp_user";
-                $new_item["createUser"] = implode("(", [$account, $company]);
+                if ($user) {
+                    $new_item["createUser"] = implode("(", [$user["account"], $company]);
+                }
             }
             $new_item["createTime"] = $item["updateTime"] ?: $item["createTime"];
             $new_list[] = $new_item;
         }
+        if ($type == \app\common\state\ProjectState::TALENT) {
+            $talentInfo = TalentApi::getOne($mainId);
+            if ($talentInfo["oldId"]) {
+                $where = [];
+                $where[] = ["mainId", "=", $talentInfo["oldId"]];
+                $where[] = ["type", "=", \app\common\state\ProjectState::TALENT];
+                $before_list = Db::table("un_talent_checklog")->where($where)->order("createTime desc")->select();
+                foreach ($before_list as $before_item) {
+                    $new_list[] = [
+                        "stepName" => DictApi::getOldStepNameByStep($before_item["step"]),
+                        "stateName" => DictApi::getOldStateNameByState($before_item["state"]),
+                        "stateChange" => $before_item["stateChange"],
+                        "description" => $before_item["description"],
+                        "createUser" => $before_item["createUser"],
+                        "createTime" => $before_item["createTime"]
+                    ];
+                }
+            }
+        }
         return json(["rows" => $new_list]);
     }
 
@@ -341,6 +361,7 @@ class Api extends BaseController {
         $where = [["mainId", "=", $mainId], ["typeId", "=", $typeId]];
         $list = Db::table("new_talent_file")->where($where)->select()->toArray();
         foreach ($list as $key => $item) {
+            $list[$key]["ext"] = pathinfo($item["url"])["extension"];
             $list[$key]["url"] = getStoragePath($item["url"]);
         }
         return json($list);

app/job/Worker.php

@@ -70,10 +70,10 @@ class Worker {
                 $data["checkState"] = TalentState::SCND_SUBMIT;
                 break;
             case 10:
-                $data["checkState"] = TalentState::FST_VERIFY_REJECT;
+                $data["checkState"] = TalentState::SCND_SAVE;
                 break;
             case 20:
-                $data["checkState"] = TalentState::REVERIFY_REJECT;
+                $data["checkState"] = TalentState::SCND_SUBMIT;
                 break;
             case 25:
                 $data["checkState"] = TalentState::FST_VERIFY_PASS;

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

@@ -218,7 +218,7 @@ TalentInfoInfoDlg.initICFileTable = function () {
                 var checkState = $("#checkState").val();
                 for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
+                    var suffix = data[key].ext;//files[key].url.substring(sn + 1, files[key].url.length);
                     var imgStr = "";
                     if (suffix == "pdf" || suffix == "PDF") {
                         imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";