"初审将所有状态统一表述并分类（含搜索栏，列表、导出记录）：

1.保存未提交
2.初审驳回
3.待初审（首次提交）
4.待初审（重新提交）
5.待初审（部门并审驳回）
6.待初审（复审驳回）
7.初审通过（待部门并审）
8.初审通过（待复审）
9.初审不通过"

app/admin/view/talent/fst_verify.html

@@ -109,12 +109,21 @@
                                     </div>
                                     <select class="form-control" id="checkState">
                                         <option value="">---请选择---</option>
-                                        <option value="-1">保存未提交</option>
+                                        <!--<option value="-1">保存未提交</option>
                                         <option value="5">重新提交</option>
                                         <option value="1">待审核</option>
                                         <option value="2">审核驳回</option>
                                         <option value="3">审核通过</option>
-                                        <option value="4">审核不通过</option>
+                                        <option value="4">审核不通过</option>-->
+                                        <option value="1">保存未提交</option>
+                                        <option value="2">初审驳回</option>
+                                        <option value="3">待初审（首次提交）</option>
+                                        <option value="4">待初审（重新提交）</option>
+                                        <option value="5">待初审（部门并审驳回）</option>
+                                        <option value="6">待初审（复审驳回）</option>
+                                        <option value="7">初审通过（待部门并审）</option>
+                                        <option value="8">初审通过（待复审）</option>
+                                        <option value="9">初审不通过</option>
                                     </select>
                                 </div>                            
                             </div>

app/common/api/VerifyApi.php

@@ -442,36 +442,47 @@ class VerifyApi {
                     break;
                 case 3:
                     switch ($params["checkState"]) {
-                        case -1://保存未提交
+                        case 1://保存未提交
                             $where[] = ["tl.new_state", "=", TalentState::SCND_SAVE];
-                            $where[] = ["tl.state", "<>", TalentState::FST_VERIFY_REJECT];
-                            //$where[] = ["ti.first_submit_time", "exp", Db::raw("is null")];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SAVE];
                             $where[] = ["ti.delete", "=", 0];
                             break;
-                        case 1://待审核
-                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
-                            //$where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
-                            $where[] = ["tl.last_state", "<>", TalentState::FST_VERIFY_REJECT];
-                            break;
-                        case 2://驳回
-                            //$where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                        case 2://初审驳回
                             $where[] = ["tl.new_state", "=", TalentState::SCND_SAVE];
                             $where[] = ["tl.state", "=", TalentState::FST_VERIFY_REJECT];
                             break;
-                        case 3://通过
-                            //$where[] = ["tl.state", "in", [TalentState::FST_VERIFY_PASS]];
-                            $whereRaw = sprintf("tl.state=%d or tl.state>%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_REJECT);
-                            break;
-                        case 4://失败
-                            $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_FAIL]];
+                        case 3://待初审（首次提交）
+                            $where[] = ["tl.last_state", "<>", TalentState::FST_VERIFY_REJECT];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
                             break;
-                        case 5://重新提交
-                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                        case 4://待初审（重新提交）
                             $where[] = ["tl.last_state", "=", TalentState::FST_VERIFY_REJECT];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
+                            break;
+                        case 5://待初审（部门并审驳回）
+                            $where[] = ["tl.new_state", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "=", TalentState::DEPT_VERIFY_REJECT];
+                            break;
+                        case 6://待初审（复审驳回）
+                            $where[] = ["tl.new_state", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "=", TalentState::REVERIFY_REJECT];
+                            break;
+                        case 7://初审通过（待部门并审）
+                            $where[] = ["ti.pass_dept_check", "=", 0];
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
+                            break;
+                        case 8://初审通过（待复审）
+                            $where[] = ["ti.pass_dept_check", "=", 1];
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
+                            break;
+                        case 9://初审不通过
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_FAIL];
                             break;
                         default:
-                            //$where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
-                            $whereRaw = sprintf("((tl.new_state=%d and ti.`delete`=0) or tl.new_state=%d or tl.state in (%d,%d) or tl.state>%d)", TalentState::SCND_SAVE, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_FAIL, TalentState::FST_VERIFY_REJECT);
+                            //$whereRaw = sprintf("((tl.new_state=%d and ti.`delete`=0) or tl.new_state=%d or tl.state in (%d,%d) or tl.state>%d)", TalentState::SCND_SAVE, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_FAIL, TalentState::FST_VERIFY_REJECT);
+                            $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
+                                    TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_FAIL]];
+                            $where[] = ["ti.delete", "=", 0];
                     }
                     break;
                 case 6:
@@ -660,36 +671,46 @@ class VerifyApi {
                     break;
                 case 3:
                     switch ($params["checkState"]) {
-                        case -1://保存未提交
+                        case 1://保存未提交
                             $where[] = ["tl.new_state", "=", TalentState::SCND_SAVE];
-                            $where[] = ["tl.state", "<>", TalentState::FST_VERIFY_REJECT];
-                            //$where[] = ["ti.first_submit_time", "exp", Db::raw("is null")];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SAVE];
                             $where[] = ["ti.delete", "=", 0];
                             break;
-                        case 1://待审核
-                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
-                            //$where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
-                            $where[] = ["tl.last_state", "<>", TalentState::FST_VERIFY_REJECT];
-                            break;
-                        case 2://驳回
-                            //$where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                        case 2://初审驳回
                             $where[] = ["tl.new_state", "=", TalentState::SCND_SAVE];
                             $where[] = ["tl.state", "=", TalentState::FST_VERIFY_REJECT];
                             break;
-                        case 3://通过
-                            //$where[] = ["tl.state", "in", [TalentState::FST_VERIFY_PASS]];
-                            $whereRaw = sprintf("tl.state=%d or tl.state>%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_REJECT);
-                            break;
-                        case 4://失败
-                            $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_FAIL]];
+                        case 3://待初审（首次提交）
+                            $where[] = ["tl.last_state", "<>", TalentState::FST_VERIFY_REJECT];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
                             break;
-                        case 5://重新提交
-                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                        case 4://待初审（重新提交）
                             $where[] = ["tl.last_state", "=", TalentState::FST_VERIFY_REJECT];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
+                            break;
+                        case 5://待初审（部门并审驳回）
+                            $where[] = ["tl.new_state", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "=", TalentState::DEPT_VERIFY_REJECT];
+                            break;
+                        case 6://待初审（复审驳回）
+                            $where[] = ["tl.new_state", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "=", TalentState::REVERIFY_REJECT];
+                            break;
+                        case 7://初审通过（待部门并审）
+                            $where[] = ["ti.pass_dept_check", "=", 0];
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
+                            break;
+                        case 8://初审通过（待复审）
+                            $where[] = ["ti.pass_dept_check", "=", 1];
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
+                            break;
+                        case 9://初审不通过
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_FAIL];
                             break;
                         default:
-                            //$where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
-                            $whereRaw = sprintf("((tl.new_state=%d and ti.`delete`=0) or tl.new_state=%d or tl.state in (%d,%d) or tl.state>%d)", TalentState::SCND_SAVE, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_FAIL, TalentState::FST_VERIFY_REJECT);
+                            $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
+                                    TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_FAIL]];
+                            $where[] = ["ti.delete", "=", 0];
                     }
                     break;
                 case 4:
@@ -894,6 +915,8 @@ class VerifyApi {
                 } else {
                     $item["checkState"] = "待复审";
                 }
+            } else if ($item["state"] == TalentState::REVERIFY_REJECT) {
+                $item["checkState"] = "待初审（复审驳回）";
             } else {
                 $item["checkState"] = TalentState::getStateName($item["state"]);
             }