|
|
@@ -777,7 +777,7 @@ class TalentAllowance extends AdminController {
|
|
|
return new Response(Response::ERROR, "请至少选择一行数据");
|
|
|
}
|
|
|
$where = [];
|
|
|
- $where[] = ["id", "in"];
|
|
|
+ $where[] = ["id", "in", $ids];
|
|
|
$list = TaModel::where($where)->select()->toArray();
|
|
|
$logList = [];
|
|
|
try {
|
|
|
@@ -1007,7 +1007,7 @@ class TalentAllowance extends AdminController {
|
|
|
for ($m = 1; $m <= 12; $m++) {
|
|
|
$months[] = $m . "月";
|
|
|
}
|
|
|
- $columns = [["年度", [1, 2]], ["所属镇街", [1, 2]], ["姓名", [1, 2]], ["性别", [1, 2]], ["证件号码", [1, 2]], ["人才层次", [1, 2]], ["认定条件", [1, 2]], ["认定条件取得时间", [1, 2]], ["认定条件名称", [1, 2]], ["公布入选月份", [1, 2]], ["拟认定津补贴类型", [1, 2]], ["拟兑现月份", [1, 2]], ["拟兑现金额", [1, 2]], ["拟兑现金额说明", [1, 2]],["津补贴类型", [1, 2]], ["兑现月份", [1, 2]], ["兑现金额", [1, 2]], ["金额说明", [1, 2]], ["审核状态", [1, 2]], ["缴纳单位", [1, 2]]];
|
|
|
+ $columns = [["年度", [1, 2]], ["所属镇街", [1, 2]], ["姓名", [1, 2]], ["性别", [1, 2]], ["证件号码", [1, 2]], ["人才层次", [1, 2]], ["认定条件", [1, 2]], ["认定条件取得时间", [1, 2]], ["认定条件名称", [1, 2]], ["公布入选月份", [1, 2]], ["拟认定津补贴类型", [1, 2]], ["拟兑现月份", [1, 2]], ["拟兑现金额", [1, 2]], ["拟兑现金额说明", [1, 2]], ["津补贴类型", [1, 2]], ["兑现月份", [1, 2]], ["兑现金额", [1, 2]], ["金额说明", [1, 2]], ["审核状态", [1, 2]], ["缴纳单位", [1, 2]]];
|
|
|
$infoCols = count($columns);
|
|
|
for ($i = 0; $i < count($projects); $i++) {
|
|
|
$columns[] = [AllowanceProjectEnum::getProjectName($projects[$i]), $months];
|
|
|
@@ -1036,7 +1036,7 @@ class TalentAllowance extends AdminController {
|
|
|
$tmpList[$item["id"]]["curEnterpriseId"] = $item["curEnterpriseId"];
|
|
|
$tmpList[$item["id"]]["info"] = [$item["year"], $streetMap[$item["address"]], $item["name"], $item["sex"] == 1 ? "男" : "女", $item["idCard"], $levelMap[$item["talentArrange"]],
|
|
|
$icmap[$item["identifyCondition"]], $item["identifyGetTime"], $item["identifyConditionName"], $item["identifyMonth"], AllowanceTypeEnum::getTypeName($item["recommendAllowanceType"]), $item["recommendMonths"], $item["recommendMoney"],
|
|
|
- $item["recommendMoneyDesc"],AllowanceTypeEnum::getTypeName($item["allowanceType"]), $item["months"], $item["money"],
|
|
|
+ $item["recommendMoneyDesc"], AllowanceTypeEnum::getTypeName($item["allowanceType"]), $item["months"], $item["money"],
|
|
|
$item["moneyDesc"], $this->getCheckStateName($item["checkState"], $item["publicState"], $item["allowanceType"])];
|
|
|
}
|
|
|
if (!$tmpList[$item["id"]]["enterprise"][$item["enterpriseId"]]) {
|
|
|
@@ -2040,7 +2040,6 @@ class TalentAllowance extends AdminController {
|
|
|
$info["recommendTalentArrangeName"] = $levelMap[$info["recommendTalentArrange"]];
|
|
|
$info["jtTalentArrangeName"] = $levelMap[$info["jtTalentArrange"]];
|
|
|
$info["introductionModeName"] = $modeMap[$info["introductionMode"]];
|
|
|
-
|
|
|
}unset($info);
|
|
|
return $list;
|
|
|
}
|
sugangqiang