diff --git a/app/Imports/BedFirstSheetImport.php b/app/Imports/BedFirstSheetImport.php index 6fb21e2..8594045 100644 --- a/app/Imports/BedFirstSheetImport.php +++ b/app/Imports/BedFirstSheetImport.php @@ -202,6 +202,16 @@ class BedFirstSheetImport implements ToCollection, WithBatchInserts, WithChunkRe //床位id $arr["bed_id"] = $bedList[trim($item["床位号"])]["id"]; + //走读生 + if(trim($item["走读生"]) == "是"){ + $arr["day_student"] = AllocationDormitoryBed::DAY_STUDENT_YES; + } + + //零元入学 + if(trim($item["零元入学"]) == "是"){ + $arr["zero_enrol"] = AllocationDormitoryBed::ZERO_ENROL_YES; + } + array_push($insertData, $arr); } diff --git a/storage/app/public/excelTemplate/dormitoryTemplate.xlsx b/storage/app/public/excelTemplate/dormitoryTemplate.xlsx index f7afc84..fddb7a3 100644 Binary files a/storage/app/public/excelTemplate/dormitoryTemplate.xlsx and b/storage/app/public/excelTemplate/dormitoryTemplate.xlsx differ