|
@@ -939,7 +939,7 @@ class TalentAllowance extends AdminController {
|
|
public function exportBasicInfo() {
|
|
public function exportBasicInfo() {
|
|
$obj["year"] = \StrUtil::getRequestDecodeParam($this->request, "year");
|
|
$obj["year"] = \StrUtil::getRequestDecodeParam($this->request, "year");
|
|
$obj["enterpriseName"] = \StrUtil::getRequestDecodeParam($this->request, "enterpriseName");
|
|
$obj["enterpriseName"] = \StrUtil::getRequestDecodeParam($this->request, "enterpriseName");
|
|
- $obj["name"]= \StrUtil::getRequestDecodeParam($this->request, "name");
|
|
|
|
|
|
+ $obj["name"] = \StrUtil::getRequestDecodeParam($this->request, "name");
|
|
$obj["idCard"] = \StrUtil::getRequestDecodeParam($this->request, "idCard");
|
|
$obj["idCard"] = \StrUtil::getRequestDecodeParam($this->request, "idCard");
|
|
$obj["talentType"] = \StrUtil::getRequestDecodeParam($this->request, "talentType");
|
|
$obj["talentType"] = \StrUtil::getRequestDecodeParam($this->request, "talentType");
|
|
$obj["talentArrange"] = \StrUtil::getRequestDecodeParam($this->request, "talentArrange");
|
|
$obj["talentArrange"] = \StrUtil::getRequestDecodeParam($this->request, "talentArrange");
|
|
@@ -1022,7 +1022,7 @@ class TalentAllowance extends AdminController {
|
|
private function valideAllowanceType(&$info, $projectList, $monthMap, $monthAndDayMap) {
|
|
private function valideAllowanceType(&$info, $projectList, $monthMap, $monthAndDayMap) {
|
|
$set = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
|
|
$set = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
|
|
/* * 2.判定工作月份、五险和个税是否满足重叠6个月要求* */
|
|
/* * 2.判定工作月份、五险和个税是否满足重叠6个月要求* */
|
|
- $workdaySet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_WORKDAY], $info, "上年度工作月份", "①");
|
|
|
|
|
|
+ $workdaySet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_ATTENDANCE], $info, "上年度工作月份", "①");
|
|
$pensionSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_PENSION], $info, "养老保险", "②");
|
|
$pensionSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_PENSION], $info, "养老保险", "②");
|
|
$unemploymentSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT], $info, "失业保险", "③");
|
|
$unemploymentSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT], $info, "失业保险", "③");
|
|
$medicaSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_MEDICA], $info, "医疗保险", "④");
|
|
$medicaSet = $this->chkMonths($monthMap[AllowanceProjectEnum::PROJECT_SB_MEDICA], $info, "医疗保险", "④");
|
|
@@ -1065,7 +1065,7 @@ class TalentAllowance extends AdminController {
|
|
if ($info["recommendAllowanceType"] == 2) {
|
|
if ($info["recommendAllowanceType"] == 2) {
|
|
//判断境内工作时间是否大于30天
|
|
//判断境内工作时间是否大于30天
|
|
$totalDays = 0;
|
|
$totalDays = 0;
|
|
- $workmonths = $monthAndDayMap[AllowanceProjectEnum::PROJECT_WORKDAY];
|
|
|
|
|
|
+ $workmonths = $monthAndDayMap[AllowanceProjectEnum::PROJECT_ATTENDANCE];
|
|
foreach ($workmonths as $days) {
|
|
foreach ($workmonths as $days) {
|
|
$totalDays += $days;
|
|
$totalDays += $days;
|
|
}
|
|
}
|
|
@@ -1396,14 +1396,14 @@ class TalentAllowance extends AdminController {
|
|
$project["projectName"] = AllowanceProjectEnum::getProjectName($project["project"]);
|
|
$project["projectName"] = AllowanceProjectEnum::getProjectName($project["project"]);
|
|
if ($info["checkState"] == 1) {
|
|
if ($info["checkState"] == 1) {
|
|
$project["isEdit"] = in_array($project["project"], [
|
|
$project["isEdit"] = in_array($project["project"], [
|
|
- AllowanceProjectEnum::PROJECT_CONTRACT,
|
|
|
|
|
|
+ //AllowanceProjectEnum::PROJECT_CONTRACT,
|
|
AllowanceProjectEnum::PROJECT_TAX,
|
|
AllowanceProjectEnum::PROJECT_TAX,
|
|
AllowanceProjectEnum::PROJECT_WAGES,
|
|
AllowanceProjectEnum::PROJECT_WAGES,
|
|
AllowanceProjectEnum::PROJECT_ATTENDANCE,
|
|
AllowanceProjectEnum::PROJECT_ATTENDANCE,
|
|
AllowanceProjectEnum::PROJECT_SB_PENSION,
|
|
AllowanceProjectEnum::PROJECT_SB_PENSION,
|
|
AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT,
|
|
AllowanceProjectEnum::PROJECT_SB_UNEMPLOYMENT,
|
|
AllowanceProjectEnum::PROJECT_SB_MEDICA,
|
|
AllowanceProjectEnum::PROJECT_SB_MEDICA,
|
|
- AllowanceProjectEnum::PROJECT_WORKDAY
|
|
|
|
|
|
+ //AllowanceProjectEnum::PROJECT_WORKDAY
|
|
]) ? 1 : 2;
|
|
]) ? 1 : 2;
|
|
} else if ($info["checkState"] == 10) {
|
|
} else if ($info["checkState"] == 10) {
|
|
$projects = explode(",", $info["projects"]);
|
|
$projects = explode(",", $info["projects"]);
|