|
|
@@ -238,16 +238,7 @@ class Talent extends AdminController {
|
|
|
* @auth {{/talentInfo/gotoIndex/1}}
|
|
|
*/
|
|
|
public function fst_verify() {
|
|
|
- $enterprises = EnterpriseApi::getSimpleList();
|
|
|
- $conditions = TalentConditionApi::getList([1, 2, 3, 4, 5, 6, 7], $this->user["type"]);
|
|
|
- $industry_field_new = array_column(DictApi::findChildDictByCode("industry_field"), "code");
|
|
|
- foreach ($industry_field_new as &$field) {
|
|
|
- $field .= "_field";
|
|
|
- }
|
|
|
- $parent_industry_fields = implode(",", $industry_field_new);
|
|
|
- $where[] = ["d2.code", "in", $parent_industry_fields];
|
|
|
- $industry_field_old = \app\common\model\Dict::alias("d1")->field("d1.*,d2.`name` as pname")->leftJoin("new_talent_dict d2", "d1.pid=d2.id")->order("name asc")->where($where)->select();
|
|
|
- return view("", ["enterprises" => $enterprises, "talent_conditions" => $conditions, "industry_field_old" => $industry_field_old]);
|
|
|
+ return view("", $this->getCommonAssigns());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -271,10 +262,12 @@ class Talent extends AdminController {
|
|
|
* @auth {{/talentInfo/gotoIndex/2}}
|
|
|
*/
|
|
|
public function dept_verify() {
|
|
|
- $enterprises = EnterpriseApi::getSimpleList();
|
|
|
$companys = CompanyApi::getAll();
|
|
|
$superpriv = VerifyApi::chkUserInSuperDeptUsers();
|
|
|
- return view("", ["companys" => $companys, "enterprises" => $enterprises, "superpriv" => $superpriv]);
|
|
|
+ $commonAssigns = $this->getCommonAssigns();
|
|
|
+ $assigns = ["companys" => $companys, "superpriv" => $superpriv];
|
|
|
+ $newAssigns = array_merge($assigns, $commonAssigns);
|
|
|
+ return view("", $newAssigns);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -282,8 +275,7 @@ class Talent extends AdminController {
|
|
|
* @auth {{/talentInfo/gotoIndex/3}}
|
|
|
*/
|
|
|
public function re_verify() {
|
|
|
- $enterprises = EnterpriseApi::getSimpleList();
|
|
|
- return view("", ["enterprises" => $enterprises]);
|
|
|
+ return view("", $this->getCommonAssigns());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -310,8 +302,23 @@ class Talent extends AdminController {
|
|
|
"phone" => "0595-82250007、0595-82250001", "email" => "jjjcdr@163.com"
|
|
|
];
|
|
|
}
|
|
|
+ $commonAssigns = $this->getCommonAssigns();
|
|
|
+ $assigns = ["message" => $message];
|
|
|
+ $newAssigns = array_merge($assigns, $commonAssigns);
|
|
|
+ return view("", $newAssigns);
|
|
|
+ }
|
|
|
+
|
|
|
+ private function getCommonAssigns() {
|
|
|
$enterprises = EnterpriseApi::getSimpleList();
|
|
|
- return view("", ["message" => $message, "enterprises" => $enterprises]);
|
|
|
+ $conditions = TalentConditionApi::getList([1, 2, 3, 4, 5, 6, 7], $this->user["type"]);
|
|
|
+ $industry_field_new = array_column(DictApi::findChildDictByCode("industry_field"), "code");
|
|
|
+ foreach ($industry_field_new as &$field) {
|
|
|
+ $field .= "_field";
|
|
|
+ }
|
|
|
+ $parent_industry_fields = implode(",", $industry_field_new);
|
|
|
+ $where[] = ["d2.code", "in", $parent_industry_fields];
|
|
|
+ $industry_field_old = \app\common\model\Dict::alias("d1")->field("d1.*,d2.`name` as pname")->leftJoin("new_talent_dict d2", "d1.pid=d2.id")->order("name asc")->where($where)->select();
|
|
|
+ return ["enterprise" => $enterprises, "talent_conditions" => $conditions, "industry_field_old" => $industry_field_old];
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -931,17 +938,17 @@ class Talent extends AdminController {
|
|
|
$data["pass_dept_check"] = 1;
|
|
|
}
|
|
|
} else if ($params["checkState"] == 4) {
|
|
|
- if ($talent_info["highProcess"] < 4)
|
|
|
- return json(["msg" => "只有曾经通过部门并审，初审时才可以选择直接跳过部门并审阶段"]);
|
|
|
-//审核成功,并设置越过部门并审。附加条件：最高进度曾经通过部门并审4（包含部门并审）
|
|
|
+ if ($talent_info["highProcess"] < 3)
|
|
|
+ return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择直接跳过部门并审阶段"]);
|
|
|
+//审核成功,并设置越过部门并审。附加条件：最高进度曾经通过初审3，上级驳回后重新初审的
|
|
|
$log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
|
|
|
- if ($talent_info["highProcess"] >= 4) {
|
|
|
+ if ($talent_info["highProcess"] >= 3) {
|
|
|
$data["pass_dept_check"] = 1;
|
|
|
}
|
|
|
} else if ($params["checkState"] == 5) {
|
|
|
//选择重审部门
|
|
|
- if ($talent_info["highProcess"] < 4)
|
|
|
- return json(["msg" => "只有曾经通过部门并审，初审时才可以选择再次审核的部门"]);
|
|
|
+ if ($talent_info["highProcess"] < 3)
|
|
|
+ return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择再次审核的部门"]);
|
|
|
if (!$params["companys"])
|
|
|
return json(["msg" => "请选择需要再次审核的部门"]);
|
|
|
$condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
|
sugangqiang