|
|
@@ -975,28 +975,22 @@ class TalentAllowance extends AdminController {
|
|
|
$where = [];
|
|
|
$where[] = ["id", "in", explode(",", $this->request["ids"])];
|
|
|
$list = TaModel::where($where)->select()->toArray();
|
|
|
- /* * 查询相关的津补贴人才层次 */
|
|
|
- $where = [];
|
|
|
- $where[] = ["mainId", "in", explode(",", $this->request["ids"])];
|
|
|
- $arrangeList = TalentAllowanceArrange::where($where)->select()->toArray();
|
|
|
- foreach ($arrangeList as &$arrange) {
|
|
|
- $arrange["talentArrangeName"] = $levelMap[$arrange["talentArrange"]];
|
|
|
- }unset($arrange);
|
|
|
- /* Map<String,List<TalentAllowanceArrange>> arrangeMap = arrangeList.stream().collect(Collectors.groupingBy(TalentAllowanceArrange::getMainId));
|
|
|
- Integer sheetSize = 0;
|
|
|
- for(TalentAllowanceInfo info:allList){
|
|
|
- info.setEnterpriseName(enterpriseMap.get(info.getEnterpriseId()));
|
|
|
- info.setAddressName(streetMap.get(info.getAddress()));
|
|
|
- info.setTalentArrangeName(levelMap.get(info.getTalentArrange()));
|
|
|
- if(info.getRecommendAllowanceType() == 1){
|
|
|
- info.setArrangeList(arrangeMap.get(info.getId()));
|
|
|
- sheetSize = sheetSize + info.getArrangeList().size();
|
|
|
- }else if(info.getRecommendAllowanceType() == 1){
|
|
|
- sheetSize++;
|
|
|
- }
|
|
|
- } */
|
|
|
- $filename = CommonConst::getTypeName($this->user["type"]) . $list[0]["year"] . "年度津补贴拟发放对象名单";
|
|
|
- $columns = ["序号", "姓名", "工作单位", "镇(街道)", "人才层次", "津补贴享受月份数", "每月享受津贴标准(元)", $list[0]["year"] . "年度累计应享受津补贴金额(元)", "备注"];
|
|
|
+ $rows = [];
|
|
|
+ for ($i = 0; $i < count($list); $i++) {
|
|
|
+ $item = $list[$i];
|
|
|
+ $rows[] = [
|
|
|
+ $i + 1, $item["name"], $enterpriseMap[$item["enterpriseId"]], $streetMap[$item["address"]], $levelMap[$item["talentArrange"]], $item["description"]
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ $filename = CommonConst::getTypeName($this->user["type"]) . $allList[0]["year"] . "年度津补贴拟发放对象名单";
|
|
|
+ $columns = ["序号", "姓名", "工作单位", "镇(街道)", "人才层次", "备注"];
|
|
|
+ if ($rows) {
|
|
|
+ export($columns, $rows, $filename);
|
|
|
+ exit();
|
|
|
+ } else {
|
|
|
+ $response->msg = "没有选择导出的名单";
|
|
|
+ return \StrUtil::back($response, "TalentAllowanceInfo.hczxCallBack");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1180,6 +1174,7 @@ class TalentAllowance extends AdminController {
|
|
|
/* * 获取各个项目的综合月份 */
|
|
|
$monthMap = $this->mergeMonth($detailMonthList);
|
|
|
$monthAndDayMap = $this->mergeMonthNeedDay($detailMonthList);
|
|
|
+ $info["backWork"] = $old["backWork"];
|
|
|
$info["recommendAllowanceType"] = $old["allowanceType"];
|
|
|
$info["recommendAllowanceMsg"] = "";
|
|
|
$projectList = \app\common\model\TalentAllowanceProject::where("mainId", $info["id"])->select()->toArray();
|
|
|
@@ -1223,12 +1218,23 @@ class TalentAllowance extends AdminController {
|
|
|
$set = array_intersect($set, $pensionSet);
|
|
|
$set = array_intersect($set, $taxSet);
|
|
|
} else if ($info["type"] == CommonConst::ENTERPRISE_GJ) {
|
|
|
- $set = array_intersect($set, $contractSet);
|
|
|
- $set = array_intersect($set, $workdaySet);
|
|
|
- $set = array_intersect($set, $wageSet);
|
|
|
- $checkSet = $set;
|
|
|
- $set = array_intersect($set, $pensionSet);
|
|
|
- $set = array_intersect($set, $taxSet);
|
|
|
+ if ($info["backWork"] == 1) {
|
|
|
+ $str = "工资发放月份、个税缴交月份";
|
|
|
+ $set = array_intersect($set, $wageSet);
|
|
|
+ $set = array_intersect($set, $taxSet);
|
|
|
+ $checkSet = $set;
|
|
|
+ $set = array_intersect($set, $contractSet);
|
|
|
+ $set = array_intersect($set, $pensionSet);
|
|
|
+ $set = array_intersect($set, $workdaySet);
|
|
|
+ } else {
|
|
|
+ $str = "养老保险缴交月份、工资发放月份、个税缴交月份";
|
|
|
+ $set = array_intersect($set, $pensionSet);
|
|
|
+ $set = array_intersect($set, $wageSet);
|
|
|
+ $set = array_intersect($set, $taxSet);
|
|
|
+ $checkSet = $set;
|
|
|
+ $set = array_intersect($set, $contractSet);
|
|
|
+ $set = array_intersect($set, $workdaySet);
|
|
|
+ }
|
|
|
} else {
|
|
|
$set = array_intersect($set, $contractSet);
|
|
|
$set = array_intersect($set, $workdaySet);
|
|
|
@@ -1592,6 +1598,12 @@ class TalentAllowance extends AdminController {
|
|
|
$res["files"] = $filetypes;
|
|
|
$res["projects"] = $projectList;
|
|
|
$res["concats"] = $detailList;
|
|
|
+ if ($process == 1) {
|
|
|
+ $standard = \app\common\api\AmountStandardApi::getStandard($info["type"], $info["allowanceType"], $info["talentArrange"]);
|
|
|
+
|
|
|
+ $res["calResult"] = TalentAllowanceApi::validateAllowanceType($id);
|
|
|
+ $res["calResult"]["money"] = $standard ? $standard["money"] : 0;
|
|
|
+ }
|
|
|
}
|
|
|
return new Response(Response::SUCCESS, "不在审核范围内", $res);
|
|
|
}
|
sugangqiang