列表及导出状态整理

app/common/api/DictApi.php

@@ -389,7 +389,7 @@ class DictApi {
                 if ($step == 3) {
                     $str = '<span class="label label-success">待部门审核</span>';
                 } else {
-                    $str = '<span class="label label-success">待复核</span>';
+                    $str = '<span class="label label-success">待复审</span>';
                 }
                 break;
             case 11:
@@ -399,7 +399,7 @@ class DictApi {
                 if ($step == 3) {
                     $str = '<span class="label label-primary">部门通过</span>';
                 } else {
-                    $str = '<span class="label label-success">待复核</span>';
+                    $str = '<span class="label label-success">待复审</span>';
                 }
                 break;
             case 13:

app/common/api/TalentState.php

@@ -77,7 +77,7 @@ class TalentState {
             case 13:
                 return "部门并审驳回";
             case 14:
-                return "复审成功";
+                return "复审通过";
             case 15:
                 return "复审驳回";
             case 16:

app/common/api/VerifyApi.php

@@ -855,26 +855,44 @@ class VerifyApi {
             } else if ($item["state"] == TalentState::FST_VERIFY_PASS) {
                 if ($item["deptCheckState"]) {
                     if ($item["acitve"] == 0 && $item["state"] == TalentState::FST_VERIFY_PASS) {
-                        $item["checkState"] = "待部门审核";
+                        $item["checkState"] = "待部门并审";
                     }
                     if ($item["active"] == 1 && $item["new_state"] == TalentState::DEPT_VERIFY_PASS) {
-                        $item["checkState"] = "部门审核通过";
+                        $item["checkState"] = "部门并审通过";
                     }
                     if ($item["active"] == 1 && $item["new_state"] == TalentState::SCND_SUBMIT) {
-                        $item["checkState"] = "部门审核驳回";
+                        $item["checkState"] = "部门并审驳回";
                     }
                 } else {
                     if (!$item["companyIds"] || $item["pass_dept_check"] == 1) {
-                        $item["checkState"] = "待复核（初审通过）";
+                        if ($process == 3) {
+                            $item["checkState"] = "初审通过（待复审）";
+                        } else {
+                            $item["checkState"] = "待复审";
+                        }
                     }
                     if ($item["pass_dept_check"] == 0) {
-                        $item["checkState"] = "待部门并审";
+                        if ($process == 3) {
+                            $item["checkState"] = "初审通过（待部门并审）";
+                        } else {
+                            $item["checkState"] = "待部门并审";
+                        }
                     }
                 }
             } else if ($item["state"] == TalentState::DEPT_VERIFY_REJECT) {
-                $item["checkState"] = "待初审（部门并审驳回）";
+                if ($process == 3) {
+                    $item["checkState"] = "待初审（部门并审驳回）";
+                } else {
+                    $item["checkState"] = "部门并审驳回";
+                }
             } else if ($item["state"] == TalentState::DEPT_VERIFY_PASS) {
-                $item["checkState"] = "待复核（部门并审通过）";
+                if ($process == 3) {
+                    $item["checkState"] = "待复审（部门并审通过）";
+                } else if ($process == 4) {
+                    $item["checkState"] = "部门并审通过";
+                } else {
+                    $item["checkState"] = "待复审";
+                }
             } else {
                 $item["checkState"] = TalentState::getStateName($item["state"]);
             }
@@ -891,15 +909,15 @@ class VerifyApi {
                     if ($log["active"] == 1) {
                         if ($log["new_state"] == 9) {
                             $verifyDepts[$k] .= "（审核驳回）";
-                            $item["deptReject"] ++;
+                            $item["deptReject"]++;
                         }
                         if ($log["new_state"] == 12) {
                             $verifyDepts[$k] .= "（审核通过）";
-                            $item["deptPass"] ++;
+                            $item["deptPass"]++;
                         }
                     } else {
                         $verifyDepts[$k] .= "（待审核）";
-                        $item["deptWait"] ++;
+                        $item["deptWait"]++;
                     }
                 }
                 $item["verifyDepts"] = implode(chr(10), $verifyDepts);

app/job/Talent.php

@@ -90,7 +90,7 @@ class Talent {
                             $fileTypes = $companyAndTypes[$companyId];
                             $modify_files = array_unique((array_merge((array) $modify_files, (array) $fileTypes)));
                             $dept_log = TalentLogApi::getLogByCompanyId($talent_info["id"], $companyId, $fst_dept_check_time);
-                            TalentLogApi::rewrite($dept_log["id"], [$log_checkState, $checkState], "审核超时，系统自动驳回");
+                            TalentLogApi::rewrite($dept_log["id"], [$log_checkState, $checkState], "审核超时，系统自动驳回", 1);
                         }
                         $log_checkState = TalentState::DEPT_VERIFY_REJECT;
                         $data["id"] = $talent_info["id"];

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

@@ -14,6 +14,7 @@ var TalentInfo = {
 TalentInfo.initColumn = function () {
     var type = $("#type").val();
     var code = $("#deptCode").val();
+    var process = $("#process").val();
     var isShow = true;
     var isShowVerifyDept = false;
     if (type == 2) {
@@ -67,15 +68,15 @@ TalentInfo.initColumn = function () {
             formatter: function (value, row, index) {
                 if (typeof row.deptCheckState != "undefined") {
                     if (row.deptCheckState == 12) {
-                        return "<span class='label label-primary'>部门已通过</span>"
+                        return "<span class='label label-primary'>部门并审通过</span>"
                     } else if (row.deptCheckState == 9) {
                         if (row.lastState == 13) {
                             return "<span class='label label-success'>待重新审核</span>"
                         } else {
-                            return "<span class='label label-danger'>部门已驳回</span>"
+                            return "<span class='label label-danger'>部门并审驳回</span>"
                         }
                     } else {
-                        return "<span class='label label-success'>待审核</span>"
+                        return "<span class='label label-success'>待部门并审</span>"
                     }
                 } else {
                     if (value == 2) {
@@ -94,23 +95,40 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-success'>复审通过</span>"
                     }
                     if (value == 10) {
-                        return "<span class='label label-success'>待审核</span>"
+                        if (process == 3) {
+                            if (row.pass_dept_check == 1) {
+                                return "<span class='label label-success'>初审通过（待复审）</span>"
+                            }
+                            return "<span class='label label-success'>初审通过（待部门并审）</span>"
+                        }
+                        if (process == 4) {
+                            return "<span class='label label-success'>待部门并审</span>";
+                        }
+                        return "<span class='label label-success'>待复审</span>";
                     }
                     if (value == 8) {
                         if (row.realState == 11) {
                             return "<span class='label label-danger'>初审驳回</span>"
+                        } else {
+                            return "<span class='label label-success'>保存未提交</span>"
                         }
                     }
                     if (value == 9) {
                         if (row.realState == 13) {
-                            return "<span class='label label-danger'>部门驳回</span>"
+                            if (process == 3) {
+                                return "<span class='label label-danger'>待初审（部门并审驳回）</span>";
+                            }
+                            return "<span class='label label-danger'>部门并审驳回</span>";
                         } else if (row.realState == 15) {
-                            return "<span class='label label-danger'>复审驳回</span>"
+                            if (process == 3) {
+                                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>"
+                                return "<span class='label label-success'>待初审（重新提交）</span>"
                             }
-                            return "<span class='label label-success'>待审核</span>"
+                            return "<span class='label label-success'>待初审（首次提交）</span>"
                         }
                     }
                     if (value == 16 || value == -1 || value == -2 || value == 7) {
@@ -131,7 +149,13 @@ TalentInfo.initColumn = function () {
                         }
                     }
                     if (value == 12) {
-                        return "<span class='label label-success'>待复审</span>"
+                        if (process == 4) {
+                            return "<span class='label label-success'>部门并审通过</span>";
+                        }
+                        if (process == 3) {
+                            return "<span class='label label-success'>待复审（部门并审通过）</span>";
+                        }
+                        return "<span class='label label-success'>待复审</span>";
                     }
                     if (value == 13) {
                         if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {

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

@@ -60,6 +60,7 @@ TalentInfo.formParams = function () {
     queryData['active'] = $("#active").val()
     queryData['apply_year'] = $("#apply_year").val();
     queryData['isEffect'] = $("#isEffect").val();
+    //queryData['offset'] = 0;
     return queryData;
 }