于宏哲PHP 6 months ago
parent
commit
64315f2f08
  1. 19
      niucloud/app/api/controller/apiController/CourseSchedule.php
  2. 3
      niucloud/app/api/controller/apiController/CustomerResources.php
  3. 1
      niucloud/app/api/route/route.php
  4. 311
      niucloud/app/service/api/apiService/CourseScheduleService.php
  5. 2
      uniapp/api/apiRoute.js

19
niucloud/app/api/controller/apiController/CourseSchedule.php

@ -70,7 +70,7 @@ class CourseSchedule extends BaseApiService
["remarks", ""], ["remarks", ""],
["created_by", "manual"] ["created_by", "manual"]
]); ]);
// 验证必填字段 // 验证必填字段
$required = ['campus_id', 'venue_id', 'course_date', 'time_slot', 'course_id', 'coach_id', 'available_capacity']; $required = ['campus_id', 'venue_id', 'course_date', 'time_slot', 'course_id', 'coach_id', 'available_capacity'];
foreach ($required as $field) { foreach ($required as $field) {
@ -78,7 +78,7 @@ class CourseSchedule extends BaseApiService
return fail("字段 {$field} 不能为空"); return fail("字段 {$field} 不能为空");
} }
} }
$result = (new CourseScheduleService())->createCourseSchedule($data); $result = (new CourseScheduleService())->createCourseSchedule($data);
if (!$result['code']) { if (!$result['code']) {
return fail($result['msg']); return fail($result['msg']);
@ -149,12 +149,12 @@ class CourseSchedule extends BaseApiService
["keyword", ""], // 场地名称关键词搜索 ["keyword", ""], // 场地名称关键词搜索
["status", 1] // 状态筛选,默认获取可用场地 ["status", 1] // 状态筛选,默认获取可用场地
]); ]);
$result = (new CourseScheduleService())->getVenueListForSchedule($data); $result = (new CourseScheduleService())->getVenueListForSchedule($data);
if (!$result['code']) { if (!$result['code']) {
return fail($result['msg']); return fail($result['msg']);
} }
return success('获取成功', $result['data']); return success('获取成功', $result['data']);
} catch (\Exception $e) { } catch (\Exception $e) {
return fail('获取场地列表失败:' . $e->getMessage()); return fail('获取场地列表失败:' . $e->getMessage());
@ -173,20 +173,20 @@ class CourseSchedule extends BaseApiService
["venue_id", 0], ["venue_id", 0],
["date", ""] ["date", ""]
]); ]);
if (empty($data['venue_id'])) { if (empty($data['venue_id'])) {
return fail('场地ID不能为空'); return fail('场地ID不能为空');
} }
if (empty($data['date'])) { if (empty($data['date'])) {
return fail('查询日期不能为空'); return fail('查询日期不能为空');
} }
$result = (new CourseScheduleService())->getVenueAvailableTimeSlots($data); $result = (new CourseScheduleService())->getVenueAvailableTimeSlots($data);
if (!$result['code']) { if (!$result['code']) {
return fail($result['msg']); return fail($result['msg']);
} }
return success('获取成功', $result['data']); return success('获取成功', $result['data']);
} catch (\Exception $e) { } catch (\Exception $e) {
return fail('获取场地可用时间失败:' . $e->getMessage()); return fail('获取场地可用时间失败:' . $e->getMessage());
@ -323,6 +323,7 @@ class CourseSchedule extends BaseApiService
["class_photo", ""] ["class_photo", ""]
]); ]);
if (empty($data['schedule_id'])) { if (empty($data['schedule_id'])) {
return fail('课程安排ID不能为空'); return fail('课程安排ID不能为空');
} }
@ -383,4 +384,4 @@ class CourseSchedule extends BaseApiService
return fail('签到失败:' . $e->getMessage()); return fail('签到失败:' . $e->getMessage());
} }
} }
} }

3
niucloud/app/api/controller/apiController/CustomerResources.php

@ -138,7 +138,8 @@ class CustomerResources extends BaseApiService
"headimg" => '', // 默认空字符串 "headimg" => '', // 默认空字符串
"trial_class_count" => 2, // 默认2 "trial_class_count" => 2, // 默认2
"status" => 1, // 状态设置为1 "status" => 1, // 状态设置为1
"created_person_id" => $request->param('staff_id', 0), // 当前登录人 "created_person_id" => $request->param('staff_id', 0), // 当前登录人,
"contact_phone" => $customer_resources_data['phone_number']
]; ];
// 获取当前登录人的staff_id // 获取当前登录人的staff_id

1
niucloud/app/api/route/route.php

@ -355,6 +355,7 @@ Route::group(function () {
//员工端-单个学员签到 //员工端-单个学员签到
Route::post('courseSchedule/updateStudentStatus', 'apiController.CourseSchedule/updateStudentStatus'); Route::post('courseSchedule/updateStudentStatus', 'apiController.CourseSchedule/updateStudentStatus');
// 课程安排统一选项接口(新增-支持校区过滤) // 课程安排统一选项接口(新增-支持校区过滤)
//获取所有排课选项(统一接口-支持校区过滤) //获取所有排课选项(统一接口-支持校区过滤)
Route::get('schedule/options/all', 'apiController.ScheduleOptions/getAllOptions'); Route::get('schedule/options/all', 'apiController.ScheduleOptions/getAllOptions');

311
niucloud/app/service/api/apiService/CourseScheduleService.php

File diff suppressed because it is too large

2
uniapp/api/apiRoute.js

@ -1223,7 +1223,7 @@ export default {
// 提交课程点名 // 提交课程点名
async submitScheduleSignIn(data = {}) { async submitScheduleSignIn(data = {}) {
return await http.post('/courseSchedule/signIn', data) return await http.post('/courseSchedule/batchSignIn', data)
}, },
//↓↓↓↓↓↓↓↓↓↓↓↓-----添加课程安排页面专用接口-----↓↓↓↓↓↓↓↓↓↓↓↓ //↓↓↓↓↓↓↓↓↓↓↓↓-----添加课程安排页面专用接口-----↓↓↓↓↓↓↓↓↓↓↓↓

Loading…
Cancel
Save