|
@@ -336,11 +336,11 @@ class TalentBasicChange extends EnterpriseController {
|
|
|
$where[] = ["ti.enterprise_id", "=", session("user")["uid"]];
|
|
|
}
|
|
|
|
|
|
- $now = strtotime("Y-m-d",time());
|
|
|
+ $now = date("Y-m-d",time());
|
|
|
|
|
|
$count = Talent::alias("ti")->field("ti.id,ti.name,ti.card_number,ti.labor_contract_rangetime")->leftJoin("un_talent_basic_change tbc","ti.id = tbc.talentId")->whereRaw("trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3)) < '{$now}' and tbc.id is NULL and ti.delete = 0 and ti.checkState = '" .TalentState::CERTIFICATED . "' and ti.active = 1 and ti.enterprise_id = '" . session("user")["uid"] . "'")->count();
|
|
|
$list = Talent::alias("ti")->field("ti.id,ti.name,ti.card_number,ti.labor_contract_rangetime")->leftJoin("un_talent_basic_change tbc","ti.id = tbc.talentId")->whereRaw("trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3)) < '{$now}' and tbc.id is NULL and ti.delete = 0 and ti.checkState = '" .TalentState::CERTIFICATED . "' and ti.active = 1 and ti.enterprise_id = '" . session("user")["uid"] . "'")->limit($offset, $limit)->select()->toArray();
|
|
|
-
|
|
|
+ echo Talent::getLastSql();die;
|
|
|
|
|
|
return json(["total" => $count, "rows" => $list]);
|
|
|
}
|