电路初审和复审列表默认仅待审核

app/admin/view/talent/fst_verify.html

@@ -119,9 +119,13 @@
                                         <option value="2">初审驳回</option>
                                         <option value="3">待初审（首次提交）</option>
                                         <option value="4">待初审（重新提交）</option>
+                                        {if condition="in_array($type,[1])"}
                                         <option value="5">待初审（部门并审驳回）</option>
+                                        {/if}
                                         <option value="6">待初审（复审驳回）</option>
+                                        {if condition="in_array($type,[1])"}
                                         <option value="7">初审通过（待部门并审）</option>
+                                        {/if}
                                         <option value="8">初审通过（待复审）</option>
                                         <option value="9">初审不通过</option>
                                     </select>

app/common/api/VerifyApi.php

@@ -369,7 +369,8 @@ class VerifyApi {
         $order = $params["order"] ?: "desc";
         $offset = $params["offset"] ?: 0;
         $limit = $params["limit"] ?: 10;
-        $where[] = ["e.type", "=", session("user")["type"]];
+        $type = session("user")["type"];
+        $where[] = ["e.type", "=", $type];
         if ($params["name"]) {
             $where[] = ["ti.name", "like", "%{$params["name"]}%"];
         }
@@ -475,6 +476,11 @@ class VerifyApi {
                 case 5://复审不通过
                     $where[] = ["tl.state", "=", TalentState::REVERIFY_FAIL];
                     break;
+                default:
+                    if ($type == 2) {
+                        $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS]];
+                    }
+                    break;
             }
             $count = Talent::alias("ti")
                             ->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")
@@ -541,9 +547,14 @@ class VerifyApi {
                             break;
                         default:
                             //$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];
+                            if ($type == 2) {
+                                $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
+                                        TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                            } else {
+                                $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:
@@ -1078,11 +1089,11 @@ 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"]++;
                             }
                             $deptDescriptions[] = sprintf("%s：%s", $company["name"], $log["description"]);
                         } else {
@@ -1091,7 +1102,7 @@ class VerifyApi {
                                 continue;
                             }
                             $verifyDepts[$k] .= "（待审核）";
-                            $item["deptWait"] ++;
+                            $item["deptWait"]++;
                         }
                     }
                     $item["verifyDepts"] = implode(chr(10), $verifyDepts);