diff --git a/app/Imports/FirstSheetImport.php b/app/Imports/FirstSheetImport.php index 863b9ed..5df0596 100644 --- a/app/Imports/FirstSheetImport.php +++ b/app/Imports/FirstSheetImport.php @@ -93,6 +93,16 @@ class FirstSheetImport implements ToCollection, WithBatchInserts, WithChunkReadi $arr["sex"] = 2; } + //走读生 + if(trim($item["走读生"]) == "是"){ + $arr["day_student"] = AdmissionNewStudents::DAY_STUDENT_YES; + } + + //零元入学 + if(trim($item["零元入学"]) == "是"){ + $arr["zero_enrol"] = AdmissionNewStudents::ZERO_ENROL_YES; + } + //检测专业 //取出所有二级学院 $secondaryCollegeList = SecondaryCollege::query()->where([ diff --git a/app/Models/AdmissionNewStudents.php b/app/Models/AdmissionNewStudents.php index 01a549b..5bfda55 100644 --- a/app/Models/AdmissionNewStudents.php +++ b/app/Models/AdmissionNewStudents.php @@ -28,4 +28,8 @@ class AdmissionNewStudents extends Model const ZERO_ENROL_NO = 1; //是否允许0元入学 否 const ZERO_ENROL_YES = 2; //是 + + + const DAY_STUDENT_YES = 2; //是否为走读生 1否 2是 + const DAY_STUDENT_NO = 1; } diff --git a/storage/app/public/excelTemplate/newStudentTemplate.xlsx b/storage/app/public/excelTemplate/newStudentTemplate.xlsx index 3a46cae..9c5afd8 100644 Binary files a/storage/app/public/excelTemplate/newStudentTemplate.xlsx and b/storage/app/public/excelTemplate/newStudentTemplate.xlsx differ