diff --git a/app/Http/Controllers/Admin/CourseContentController.php b/app/Http/Controllers/Admin/CourseContentController.php index 0076e52..f24a2d3 100755 --- a/app/Http/Controllers/Admin/CourseContentController.php +++ b/app/Http/Controllers/Admin/CourseContentController.php @@ -239,17 +239,28 @@ class CourseContentController extends BaseController if (!in_array('上课地点', $keyList)) { return $this->fail([ResponseCode::ERROR_BUSINESS, '上课地点字段不存在']); } + if (!in_array('联系方式', $keyList)) { + return $this->fail([ResponseCode::ERROR_BUSINESS, '联系方式字段不存在']); + } + if (!in_array('性别', $keyList)) { + return $this->fail([ResponseCode::ERROR_BUSINESS, '性别字段不存在']); + } $list = []; foreach ($dataArray as $value) { + if (empty($value['联系方式'])) { + continue; + } $list[] = [ 'course_id' => $course_id, 'date' => Carbon::parse($value['日期'])->toDateString(), - 'period' => $value['时间'], + 'period' => $value['时间'] ?? '', 'teacher_name' => $value['授课老师'], - 'teacher_introduce' => $value['老师简介'], - 'teacher_id' => Teacher::where('name', $value['授课老师'])->value('id'), - 'address' => $value['上课地点'], - 'theme' => $value['课程主题'] + 'teacher_introduce' => $value['老师简介'] ?? '', + 'teacher_id' => Teacher::where('mobile', $value['联系方式'])->value('id'), + 'address' => $value['上课地点'] ?? '', + 'theme' => $value['课程主题'] ?? '', + 'sex' => $value['性别'] ?? '', + 'mobile' => $value['联系方式'] ?? '' ]; } return $this->success($list); @@ -293,8 +304,13 @@ class CourseContentController extends BaseController foreach ($records as $item) { if (!isset($item['teacher_id']) || empty($item['teacher_id'])) { // 写入老师表 - $where = ['name' => $item['teacher_name']]; - $data = ['name' => $item['teacher_name'], 'introduce' => $item['teacher_introduce']]; + $where = ['mobile' => $item['mobile']]; + $data = [ + 'mobile' => $item['mobile'], + 'name' => $item['teacher_name'], + 'introduce' => $item['teacher_introduce'], + 'sex'=>$item['sex'], + ]; $teacher = Teacher::updateOrCreate($where, $data); $item['teacher_id'] = $teacher->id; }