1、离职审核端修改名字身份证企业搜索为模糊查找

2、津补贴审核导出基础信息增加审核意见字段

app/admin/controller/TalentAllowance.php

@@ -790,7 +790,7 @@ class TalentAllowance extends AdminController {
                             }unset($detail);
                         }
                         $set = array_filter($set);
-                        usort($set, function($a, $b) {
+                        usort($set, function ($a, $b) {
                             return (int) $a - (int) $b;
                         });
                         $old["recommendAllowanceType"] = $param["resAllowanceType"];
@@ -1086,13 +1086,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]]];
+        $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]]];
         $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.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.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)
@@ -1116,7 +1116,7 @@ class TalentAllowance extends AdminController {
                 $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"], $item["otherEnjoyedMoney"], $item["otherEnjoyedDescription"] ?: "", AllowanceTypeEnum::getTypeName($item["allowanceType"]), $item["months"], $item["money"],
-                    $item["moneyDesc"], $this->getCheckStateName($item["checkState"], $item["publicState"], $item["allowanceType"])];
+                    $item["moneyDesc"], $this->getCheckStateName($item["checkState"], $item["publicState"], $item["allowanceType"]), $item["checkMsg"]];
             }
             if (!$tmpList[$item["id"]]["enterprise"][$item["enterpriseId"]]) {
                 $tmpList[$item["id"]]["enterprise"][$item["enterpriseId"]] = [
@@ -1226,7 +1226,7 @@ class TalentAllowance extends AdminController {
             $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . "一次性交通补贴;";
         if ($info["recommendAllowanceType"] == 3)
             $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . "不予兑现;";
-        usort($set, function($a, $b) {
+        usort($set, function ($a, $b) {
             return (int) $a - (int) $b;
         });
         //}
@@ -1284,7 +1284,7 @@ class TalentAllowance extends AdminController {
             $set = array_intersect($set, $medicaSet);
             $set = array_intersect($set, $taxSet);
         }
-        usort($set, function($a, $b) {
+        usort($set, function ($a, $b) {
             return (int) $a - (int) $b;
         });
         if ($info["recommendAllowanceType"] == 1) {
@@ -1382,7 +1382,7 @@ class TalentAllowance extends AdminController {
                         $jobMoney += $total;
                         $msgBulider[] = sprintf("%d(%s)x%s(第%d层次)", count($levelList), $levelList ? implode(",", $levelList) : "", $arrange["jobMoney"], $arrange["talentArrange"]);
                         $recommendMonths = array_merge($recommendMonths, $levelList);
-                        usort($recommendMonths, function($a, $b) {
+                        usort($recommendMonths, function ($a, $b) {
                             return (int) $a - (int) $b;
                         });
                         $arrange["months"] = implode(",", $levelList);
@@ -2193,5 +2193,4 @@ class TalentAllowance extends AdminController {
                 return "未知状态";
         }
     }
-
 }

app/admin/controller/TalentQuit.php

@@ -200,13 +200,13 @@ class TalentQuit extends AdminController {
     private function setTalentQuit($talentQuitInfo) {
         $where = [];
         if (\StrUtil::isNotEmpAndNull($talentQuitInfo["talentName"])) {
-            $where[] = ["talentName", "=", $talentQuitInfo["talentName"]];
+            $where[] = ["talentName", "like", "%" . $talentQuitInfo["talentName"] . "%"];
         }
         if (\StrUtil::isNotEmpAndNull($talentQuitInfo["idCard"])) {
-            $where[] = ["idCard", "=", $talentQuitInfo["IdCard"]];
+            $where[] = ["idCard", "like", "%" . $talentQuitInfo["IdCard"] . "%"];
         }
         if (\StrUtil::isNotEmpAndNull($talentQuitInfo["enterpriseName"])) {
-            $where[] = ["enterpriseName", "=", $talentQuitInfo["enterpriseName"]];
+            $where[] = ["enterpriseName", "like", "%" . $talentQuitInfo["enterpriseName"] . "%"];
         }
         if (\StrUtil::isNotEmpAndNull($talentQuitInfo["talentArrange"])) {
             $where[] = ["talentArrange", "=", $talentQuitInfo["talentArrange"]];