浏览代码

增加一个上传字段

zmw 1 周之前
父节点
当前提交
837a933c05
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      app/admin/controller/TalentAllowance.php
  2. 1 1
      app/job/TalentAllowance.php

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

@@ -1119,13 +1119,13 @@ 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]], ["审核状态", [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]], ["津补贴类型", [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];
         }
         $list = \app\common\model\TalentAllowanceProject::alias("pro")
-                        ->field("ta.id,ta.year,ta.enterpriseId as curEnterpriseId,ta.address,ta.name,ta.sex,ta.idCard,ta.talentArrange,ta.identifyCondition,ta.identifyGetTime,ta.identifyConditionName,ta.identifyMonth,ta.recommendAllowanceType,ta.recommendMonths,ta.recommendMoney,ta.recommendMoneyDesc,ta.otherEnjoyedMoney,ta.otherEnjoyedDescription,ta.allowanceType,ta.months,ta.money,ta.moneyDesc,ta.checkState,ta.checkMsg,ta.publicState,pro.project,pro.months as pre_months,con.enterpriseId,con.startTime,con.endTime,con.entryTime,con.quitTime,con.isQuit")
+                        ->field("ta.id,ta.year,ta.enterpriseId as curEnterpriseId,ta.address,ta.name,ta.sex,ta.idCard,ta.bank,ta.bankNumber,ta.bankNetwork,ta.bankAccount,ta.talentArrange,ta.identifyCondition,ta.identifyGetTime,ta.identifyConditionName,ta.identifyMonth,ta.recommendAllowanceType,ta.recommendMonths,ta.recommendMoney,ta.recommendMoneyDesc,ta.otherEnjoyedMoney,ta.otherEnjoyedDescription,ta.allowanceType,ta.months,ta.money,ta.moneyDesc,ta.checkState,ta.checkMsg,ta.publicState,pro.project,pro.months as pre_months,con.enterpriseId,con.startTime,con.endTime,con.entryTime,con.quitTime,con.isQuit")
                         ->leftJoin("un_talent_allowance_info ta", "ta.id=pro.mainId")
                         ->leftJoin("un_talent_allowancecontract_detail con", "pro.baseId=con.id")
                         ->where($where)

+ 1 - 1
app/job/TalentAllowance.php

@@ -216,7 +216,7 @@ class TalentAllowance {
             "newIdentifyGetTime" => $year . "-12-31"
         ];
 
-        if (in_array($info["idCard"], \app\common\api\VerifyApi::getTwiceIdentifyPersons())) {
+        if (in_array($info["idCard"], (array)\app\common\api\VerifyApi::getTwiceIdentifyPersons())) {
             $whr = [];
             $whr[] = ["ti.checkState", "=", TalentState::CERTIFICATED];
             $whr[] = ["ti.enterprise_id", "=", $talentInfo["enterpriseId"]];