Эх сурвалжийг харах

试算结果保存,并加入导出内容

sugangqiang 1 жил өмнө
parent
commit
4eba9ea898

+ 6 - 0
app/common/api/TalentAllowanceApi.php

@@ -299,6 +299,9 @@ class TalentAllowanceApi {
                 $info["recommendAllowanceMsg"][] = "经过计算:兑现月份" . count($recommendMonths) . "个月,人才津贴为<span style='color:red;font-weight:bold;'>" . $jobMoney . "</span>;";
                 $info["recommendMoney"] = $jobMoney;
                 $info["recommendMoneyDesc"] = implode("+", $msgBulider);
+                $updAllowance["id"] = $info["id"];
+                $updAllowance["virtualAmount"] = $jobMoney;
+                TaModel::update($updAllowance);
 
                 break;
             case 2:
@@ -312,6 +315,9 @@ class TalentAllowanceApi {
                 $info["workAllowanceMoney"] = 0.00;
                 $info["developAllowanceMoney"] = 0.00;
                 $info["recommendTalentArrange"] = $talentArrange;
+                $updAllowance["id"] = $info["id"];
+                $updAllowance["virtualAmount"] = $jtMoney;
+                TaModel::update($updAllowance);
                 break;
             case 3:
                 $info["recommendMoney"] = 0.00;

+ 2 - 2
app/enterprise/controller/TalentAllowance.php

@@ -1072,7 +1072,7 @@ class TalentAllowance extends EnterpriseController {
         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]]];
+        $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]]];
         $infoCols = count($columns);
         for ($i = 0; $i < count($projects); $i++) {
             $columns[] = [AllowanceProjectEnum::getProjectName($projects[$i]), $months];
@@ -1100,7 +1100,7 @@ class TalentAllowance extends EnterpriseController {
             if (!$tmpList[$item["id"]]) {
                 $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["allowanceType"]), $item["months"], $item["money"],
+                    $icmap[$item["identifyCondition"]], $item["identifyGetTime"], $item["identifyConditionName"], $item["identifyMonth"], AllowanceTypeEnum::getTypeName($item["allowanceType"]), $item["virtualAmount"], $item["months"], $item["money"],
                     $item["moneyDesc"], $this->getCheckStateName($item["checkState"], $item["publicState"], $item["allowanceType"])];
             }
             if (!$tmpList[$item["id"]]["enterprise"][$item["enterpriseId"]]) {