|
@@ -76,6 +76,7 @@ class TalentTypeChange extends AdminController {
|
|
|
$where[] = ["delete", "=", 0];
|
|
|
switch ($process) {
|
|
|
case -1:
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
|
|
|
$where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
|
|
@@ -84,11 +85,13 @@ class TalentTypeChange extends AdminController {
|
|
|
}
|
|
|
break;
|
|
|
case 1:
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "not in", [3, 5]];
|
|
|
break;
|
|
|
case 2:
|
|
|
//$where[] = ["ttc.type", "=", $this->user["type"]];
|
|
|
+ $where[] = ["ttc.createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
if (ttcApi::chkUserInSuperDeptUsers()) {
|
|
|
$where[] = ["ttc.type", "=", $this->user["type"]];
|
|
|
} else {
|
|
@@ -111,14 +114,17 @@ class TalentTypeChange extends AdminController {
|
|
|
$list = ttcModel::alias("ttc")->field("ttc.*,td.companyId,td.state as depState")->leftJoin("un_talent_depcheckstate td", "td.mainId=ttc.id")->where($where)->limit($offset, $limit)->order("ttc.createTime {$order}")->select()->toArray();
|
|
|
break;
|
|
|
case 3:
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
|
|
|
break;
|
|
|
case 4:
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "in", [-1, 35]];
|
|
|
break;
|
|
|
case 5:
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "=", 35];
|
|
|
$where[] = ["isPublic", "=", 6];
|
|
@@ -731,6 +737,7 @@ class TalentTypeChange extends AdminController {
|
|
|
$info = $this->request->param();
|
|
|
$response = new \stdClass();
|
|
|
$where = [];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
if ($info) {
|
|
|
if (\StrUtil::isNotEmpAndNull($info["talentName"])) {
|
|
@@ -1066,6 +1073,7 @@ class TalentTypeChange extends AdminController {
|
|
|
if (!strtotime($startTime) || !strtotime($endTime))
|
|
|
return json(["msg" => "时间格式错误"]);
|
|
|
$where = [];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["publicBatch", "between", [$startTime, $endTime]];
|
|
|
$list = ttcModel::where($where)->order("publicBatch")->select()->toArray();
|
|
@@ -1381,6 +1389,7 @@ class TalentTypeChange extends AdminController {
|
|
|
if (!strtotime($startTime) || !strtotime($endTime))
|
|
|
return json(["msg" => "时间格式错误"]);
|
|
|
$where = [];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["newIdentifyMonth", "between", [$startTime, $endTime]];
|
|
|
$list = ttcModel::where($where)->order("newIdentifyMonth")->select()->toArray();
|
|
@@ -1677,6 +1686,7 @@ class TalentTypeChange extends AdminController {
|
|
|
switch ($process) {
|
|
|
case -1:
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
|
|
|
$where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
|
|
|
if ($this->user["code"] != $company["code"]) {
|
|
@@ -1686,6 +1696,7 @@ class TalentTypeChange extends AdminController {
|
|
|
case 1:
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "not in", [3, 5]];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
break;
|
|
|
case 2:
|
|
|
//$where[] = ["ttc.type", "=", $this->user["type"]];
|
|
@@ -1696,6 +1707,7 @@ class TalentTypeChange extends AdminController {
|
|
|
$where[] = ["td.companyId", "=", $companyId];
|
|
|
}
|
|
|
$where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
|
|
|
+ $where[] = ["ttc.createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
switch ($checkState) {
|
|
|
case 1:
|
|
|
case 2:
|
|
@@ -1711,16 +1723,19 @@ class TalentTypeChange extends AdminController {
|
|
|
break;
|
|
|
case 3:
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
$whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
|
|
|
break;
|
|
|
case 4:
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "in", [-1, 35]];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
break;
|
|
|
case 5:
|
|
|
$where[] = ["type", "=", $this->user["type"]];
|
|
|
$where[] = ["checkState", "=", 35];
|
|
|
$where[] = ["isPublic", "=", 6];
|
|
|
+ $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
|
|
|
break;
|
|
|
}
|
|
|
if ($process != 2) {
|