|
|
@@ -707,6 +707,7 @@ class VerifyApi {
|
|
|
->where($where)
|
|
|
->select()->toArray();
|
|
|
}
|
|
|
+ $un_common_location = Db::table("un_common_location")->column('name','code');
|
|
|
foreach ($list as &$item) {
|
|
|
$item["card_type"] = $cardTypes[$item["card_type"]];
|
|
|
$item["industryFieldNew"] = $industry_fields[$item["industryFieldNew"]];
|
|
|
@@ -728,20 +729,21 @@ class VerifyApi {
|
|
|
$item["source"] = $source[$item["source"]];
|
|
|
$item["talent_arrange"] = $talent_arrange[$item["talent_arrange"]];
|
|
|
$item["talent_condition"] = $item["talentConditionName"];
|
|
|
+
|
|
|
if (in_array("source_city", $exportFields)) {
|
|
|
- $item["source_city"] = Db::table("un_common_location")->where("code", "=", $item["source_city"])->findOrEmpty()["name"];
|
|
|
+ $item["source_city"] = $un_common_location[$item["source_city"]];
|
|
|
}
|
|
|
if (in_array("source_county", $exportFields)) {
|
|
|
- $item["source_county"] = Db::table("un_common_location")->where("code", "=", $item["source_county"])->findOrEmpty()["name"];
|
|
|
+ $item["source_county"] = $un_common_location[$item["source_county"]];
|
|
|
}
|
|
|
if (in_array("province", $exportFields)) {
|
|
|
- $item["province"] = Db::table("un_common_location")->where("code", "=", $item["province"])->findOrEmpty()["name"];
|
|
|
+ $item["province"] = $un_common_location[$item["province"]];
|
|
|
}
|
|
|
if (in_array("city", $exportFields)) {
|
|
|
- $item["city"] = Db::table("un_common_location")->where("code", "=", $item["city"])->findOrEmpty()["name"];
|
|
|
+ $item["city"] = $un_common_location[$item["city"]];
|
|
|
}
|
|
|
if (in_array("county", $exportFields)) {
|
|
|
- $item["county"] = Db::table("un_common_location")->where("code", "=", $item["county"])->findOrEmpty()["name"];
|
|
|
+ $item["county"] = $un_common_location[$item["county"]];
|
|
|
}
|
|
|
if ($item["state"] == TalentState::SCND_SUBMIT) {
|
|
|
if ($item["last_state"] == TalentState::FST_VERIFY_REJECT) {
|
sandm