|
|
@@ -268,13 +268,13 @@ class VerifyApi {
|
|
|
//$where[] = ["tl.active", "=", 0];
|
|
|
//$where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
|
|
|
//$where[] = ["tl2.resubmit", "EXP", Db::raw("is null")];
|
|
|
- $whereRaw = sprintf("((tl.active=0 and tl.state=%d) or (tl.active is null)) and tl2.resubmit is null and ti.pass_dept_check=0 and ti.checkState=%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS);
|
|
|
+ $whereRaw = sprintf("((tl.active=0 and tl.state=%d) or (tl.active is null)) and tl2.resubmit is null and ti.pass_dept_check=0 and tl.state=%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS);
|
|
|
break;
|
|
|
case 2://待部门并审（重新提交）
|
|
|
//$where[] = ["tl.active", "=", 0];
|
|
|
//$where[] = ["tl.state", "=", TalentState::FST_VERIFY_PASS];
|
|
|
//$where[] = ["tl2.resubmit", "EXP", Db::raw("is not null")];
|
|
|
- $whereRaw = sprintf("((tl.active=0 and tl.state=%d) or (tl.active is null)) and tl2.resubmit is not null and ti.pass_dept_check=0 and ti.checkState=%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS);
|
|
|
+ $whereRaw = sprintf("((tl.active=0 and tl.state=%d) or (tl.active is null)) and tl2.resubmit is not null and ti.pass_dept_check=0 and tl.state=%d", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS);
|
|
|
break;
|
|
|
case 3://部门并审通过
|
|
|
$where[] = ["tl.active", "=", 1];
|
|
|
@@ -285,7 +285,7 @@ class VerifyApi {
|
|
|
$where[] = ["tl.new_state", "=", TalentState::SCND_SUBMIT];
|
|
|
break;
|
|
|
default:
|
|
|
- $whereRaw = sprintf("(((tl.active=0 and tl.state=%d) or (tl.active is null)) and ti.pass_dept_check=0 and ti.checkState=%d) or (tl.active=1 and (tl.new_state in (%d,%d)))", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_PASS);
|
|
|
+ $whereRaw = sprintf("(((tl.active=0 and tl.state=%d) or (tl.active is null)) and ti.pass_dept_check=0 and tl.state=%d) or (tl.active=1 and (tl.new_state in (%d,%d)))", TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_PASS);
|
|
|
break;
|
|
|
}
|
|
|
|
sugangqiang