于宏哲PHP 6 months ago
parent
commit
64315f2f08
  1. 1
      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. 5
      niucloud/app/service/api/apiService/CourseScheduleService.php
  5. 2
      uniapp/api/apiRoute.js

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

@ -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不能为空');
} }

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');

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

@ -2416,7 +2416,7 @@ class CourseScheduleService extends BaseApiService
$personId = $data['person_id'] ?? 0; $personId = $data['person_id'] ?? 0;
$status = $data['status'] ?? 0; $status = $data['status'] ?? 0;
$reason = $data['reason'] ?? ''; $reason = $data['reason'] ?? '';
$resources_id = $data['resources_id'] ?? 0;
if (empty($scheduleId) || empty($personId)) { if (empty($scheduleId) || empty($personId)) {
return [ return [
'code' => 0, 'code' => 0,
@ -2432,11 +2432,12 @@ class CourseScheduleService extends BaseApiService
]; ];
} }
// 开启事务 // 开启事务
Db::startTrans(); Db::startTrans();
// 使用内部处理方法 // 使用内部处理方法
$result = $this->processSingleStudentSignIn($scheduleId, $personId, 0, $status, $reason); $result = $this->processSingleStudentSignIn($scheduleId, $personId, $resources_id, $status, $reason);
if (!$result['success']) { if (!$result['success']) {
Db::rollback(); Db::rollback();

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