|
|
@@ -44,12 +44,12 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
|
|
|
public function add() {
|
|
|
$res = $this->dataCheck($this->request);
|
|
|
- if (!$res) {
|
|
|
- return json(["msg" => "添加失败，该证件号码已申报", "code" => 500]);
|
|
|
+ if ($res !== true) {
|
|
|
+ return $res;
|
|
|
}
|
|
|
$data = $this->request->param();
|
|
|
- $data['checkState'] = TalentState::BASIC_SAVE;
|
|
|
- $data['basicState'] = TalentState::BASIC_NEED;
|
|
|
+ $data['checkState'] = MainState::SAVE;
|
|
|
+ $data['basicState'] = MainState::BASIC_NEED;
|
|
|
$data['isPublic'] = 1;
|
|
|
$data['createUser'] = $this->user["uid"];
|
|
|
$data['createTime'] = date("Y-m-d H:i:s");
|
|
|
@@ -69,10 +69,10 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
'active' => 1,
|
|
|
'state' => null,
|
|
|
'step' => 0,
|
|
|
- 'stateChange' => TalentState::stateEnum(-2),
|
|
|
+ 'stateChange' => "<span class='label label-primary'>添加</span> ->" . MainState::getStateDesc($data['checkState']),
|
|
|
'description' => '添加人才层次变更',
|
|
|
'createTime' => date("Y-m-d H:i:s", time()),
|
|
|
- 'createUser' => session('user')['name'] . "({$companyName})"
|
|
|
+ 'createUser' => session('user')['account'] . "({$companyName})"
|
|
|
]);
|
|
|
|
|
|
return json(["msg" => "添加成功", "code" => 200]);
|
|
|
@@ -87,7 +87,7 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
$response->msg = "提交审核失败，请先填写基础信息";
|
|
|
return $response;
|
|
|
}
|
|
|
- if ($info["checkState"] != -1 && $info["checkState"] != 10 && $info["checkState"] != 5) {
|
|
|
+ if ($info["checkState"] != MainState::SAVE && $info["checkState"] != MainState::FIRST_REJECT && $info["checkState"] != MainState::BEFORE_REJECT) {
|
|
|
$response->msg = "不能重复提交审核";
|
|
|
return $response;
|
|
|
}
|
|
|
@@ -96,9 +96,9 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
$where[] = ["project", "=", ProjectState::LEVELCHANGE];
|
|
|
$where[] = ["active", "=", 1];
|
|
|
$filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
|
|
|
+ $sb = [];
|
|
|
+ $sb[] = "以下为必传附件：";
|
|
|
foreach ($filetypes as $filetype) {
|
|
|
- $sb = [];
|
|
|
- $sb[] = "以下为必传附件：";
|
|
|
if ($filetype["must"] == 1) {
|
|
|
$where = [];
|
|
|
$where[] = ["mainId", "=", $id];
|
|
|
@@ -114,15 +114,15 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
return $response;
|
|
|
}
|
|
|
$data["id"] = $id;
|
|
|
- $data["checkState"] = $info["checkState"] == 2 ? 9 : 1;
|
|
|
- TqModel::update($data);
|
|
|
+ $data["checkState"] = MainState::NEED_FIRST_CHECK;
|
|
|
+ TalentTypeChangeModel::update($data);
|
|
|
$user = $this->user;
|
|
|
$log["id"] = getStringId();
|
|
|
$log["active"] = 1;
|
|
|
$log["state"] = 1;
|
|
|
$log["step"] = 0;
|
|
|
- $log["stateChange"] = "<span class='label'>待提交</span>-><span class='label label-success'>待审核</span>";
|
|
|
- $log["type"] = ProjectState::QUIT;
|
|
|
+ $log["stateChange"] = MainState::getStateDesc($info['checkState']) . "->" . MainState::getStateDesc($data['checkState']);
|
|
|
+ $log["type"] = ProjectState::LEVELCHANGE;
|
|
|
$log["mainId"] = $id;
|
|
|
$log["description"] = "确认提交审核";
|
|
|
$log["createUser"] = $user ? sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]) : "系统";
|
|
|
@@ -130,7 +130,7 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
TalentLog::create($log);
|
|
|
$response->code = 200;
|
|
|
$response->msg = "提交审核成功";
|
|
|
- $response->obj = 1;
|
|
|
+ $response->obj = 3;
|
|
|
return $response;
|
|
|
}
|
|
|
|
|
|
@@ -160,14 +160,21 @@ class TalentTypeChange extends EnterpriseController {
|
|
|
return json(["msg" => "新人才层次不能为空", "code" => 500]);
|
|
|
}
|
|
|
if (\StrUtil::isEmpOrNull($data->param('newIdentifyCondition'))) {
|
|
|
- return json(["msg" => "新人才层次不能为空", "code" => 500]);
|
|
|
+ return json(["msg" => "新认定条件不能为空", "code" => 500]);
|
|
|
+ }
|
|
|
+ if ($type == 2) {
|
|
|
+ if (\StrUtil::isEmpOrNull($data->param('newIdentifyGetTime'))) {
|
|
|
+ return json(["msg" => "新认定条件名称不能为空", "code" => 500]);
|
|
|
+ }
|
|
|
+ if (\StrUtil::isEmpOrNull($data->param('newIdentifyGetTime'))) {
|
|
|
+ return json(["msg" => "新获取时间不能为空", "code" => 500]);
|
|
|
+ }
|
|
|
}
|
|
|
$res = TalentTypeChangeModel::where('idCard', $data->param('idCard'))->where('id', '<>', $data->param('id'))->whereRaw('isPublic <> 6 and (isPublic <> 5 or checkState <> -1)')->findOrEmpty();
|
|
|
if ($res) {
|
|
|
- return true;
|
|
|
- } else {
|
|
|
- return false;
|
|
|
+ return json(["msg" => "添加失败，该证件号码已申报", "code" => 500]);
|
|
|
}
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
}
|
sugangqiang