Browse Source

修复部分已知问题

master
崔茂正 4 months ago
parent
commit
d33279ab95
  1. 18
      app/Admin/Extensions/Exporter/ImportBedExporter.php
  2. 5
      app/Services/PublicServices.php

18
app/Admin/Extensions/Exporter/ImportBedExporter.php

@ -167,15 +167,27 @@ class ImportBedExporter extends AbstractExporter implements WithMapping, WithHea
} }
} }
$dormitory = "";
$dormitoryNumber = "";
$multipleInfo = "";
if(!empty($dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"])){
$dormitory = $dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"];
}
if(!empty($dormitory[$item["dormitory_number"]]["dormitory_number"])){
$dormitoryNumber = $dormitory[$item["dormitory_number"]]["dormitory_number"];
}
if(!empty($multipleInfo[$item["multiple_worlds"]]["people"])){
$multipleInfo = $multipleInfo[$item["multiple_worlds"]]["people"];
}
$data = [ $data = [
"id" => $item["id"], "id" => $item["id"],
"sex" => $item["sex"] == 1 ? "男" : "女", "sex" => $item["sex"] == 1 ? "男" : "女",
"dormitory" => $dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"], "dormitory" => $dormitory,
"multipleInfo" => $multipleInfo[$item["multiple_worlds"]]["people"], "multipleInfo" => $multipleInfo,
"livingInfo" => $livingInfo[$item["living_area"]]["title"], "livingInfo" => $livingInfo[$item["living_area"]]["title"],
"buildingInfo" => $buildingInfo[$item["building_id"]]["building_title"], "buildingInfo" => $buildingInfo[$item["building_id"]]["building_title"],
"floorInfo" => $floorInfo[$item["floor_id"]]["floor_title"], "floorInfo" => $floorInfo[$item["floor_id"]]["floor_title"],
"dormitoryNumber" => $dormitory[$item["dormitory_number"]]["dormitory_number"], "dormitoryNumber" => $dormitoryNumber,
"bedNumber" => $bed[$item["bed_id"]]["bed_number"], "bedNumber" => $bed[$item["bed_id"]]["bed_number"],
"collegeInfo" => $collegeInfo[$specialityInfo[$item["speciality_id"]]["secondary_college_id"]]["name"], "collegeInfo" => $collegeInfo[$specialityInfo[$item["speciality_id"]]["secondary_college_id"]]["name"],
"specialityName" => $specialityInfo[$item["speciality_id"]]["speciality_name"], "specialityName" => $specialityInfo[$item["speciality_id"]]["speciality_name"],

5
app/Services/PublicServices.php

@ -27,6 +27,9 @@ class PublicServices extends BaseServices
$studentInfo = AdmissionNewStudents::query()->where([ $studentInfo = AdmissionNewStudents::query()->where([
"idCard" => $idcard "idCard" => $idcard
])->first(); ])->first();
return $studentInfo->is_new_student; if(!empty($studentInfo)){
return $studentInfo->is_new_student;
}
} }
} }

Loading…
Cancel
Save