Эх сурвалжийг харах

修改电路初审列表默认显示状态

sugangqiang 1 жил өмнө
parent
commit
8eaec8b462

+ 4 - 4
app/common/api/VerifyApi.php

@@ -575,8 +575,8 @@ class VerifyApi {
                         default:
                         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);
                             //$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);
                             if ($type == 2) {
                             if ($type == 2) {
-                                $where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT,
-                                        TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                                $where[] = ["tl.state", "in", [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];
                                 $where[] = ["ti.delete", "=", 0];
                             } else {
                             } else {
                                 $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
                                 $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
@@ -832,8 +832,8 @@ class VerifyApi {
                             break;
                             break;
                         default:
                         default:
                             if ($user["type"] == 2) {
                             if ($user["type"] == 2) {
-                                $where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT,
-                                        TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                                $where[] = ["tl.state", "in", [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];
                                 $where[] = ["ti.delete", "=", 0];
                             } else {
                             } else {
                                 $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,
                                 $where[] = ["tl.state", "in", [TalentState::SCND_SAVE, TalentState::FST_VERIFY_REJECT, TalentState::SCND_SUBMIT,