1

admin/auto-imports.d.ts

@@ -1,5 +1,5 @@
 // Generated by 'unplugin-auto-import'
 export {}
 declare global {
-
+  const ElNotification: typeof import('element-plus/es')['ElNotification']
 }

admin/components.d.ts

@@ -26,6 +26,7 @@ declare module '@vue/runtime-core' {
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
@@ -60,6 +61,7 @@ declare module '@vue/runtime-core' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

admin/src/addon/shop/views/marketing/coupon/add.vue

@@ -1,6 +1,7 @@
 <template>
+	
     <div class="main-container">
-
+		
         <el-card class="card !border-none" shadow="never">
             <el-page-header :content="pageName" :icon="ArrowLeft" @back="back()" />
         </el-card>

admin/src/addon/zhjw/api/schedules.ts

@@ -21,6 +21,10 @@ export function getSchedulesInfo(id: number) {
     return request.get(`zhjw/schedules/${id}`);
 }
 
+export function getInfo(params: Record<string, any>) {
+    return request.get(`zhjw/get_info`, {params});
+}
+
 /**
  * 添加排班管理
  * @param params

admin/src/addon/zhjw/api/timetables.ts

@@ -33,6 +33,9 @@ export function getTimetablesInfo(id: number) {
     return request.get(`zhjw/timetables/${id}`);
 }
 
+
+
+
 /**
  * 添加课表管理
  * @param params

admin/src/addon/zhjw/views/schedules/schedules_edit.vue

@@ -44,6 +44,8 @@
                         :placeholder="t('dateTimePlaceholder')">
                     </el-date-picker>
                 </el-form-item>
+				
+				
                 <el-form-item :label="t('timeSlot')" prop="time_slot">
                     <el-input v-model="formData.time_slot" clearable :placeholder="t('timeSlotPlaceholder')" class="input-width" />
                 </el-form-item>
@@ -109,12 +111,12 @@ const selectData = ref<any[]>([])
     
     const staffIdList = ref([] as any[])
     const setStaffIdList = async () => {
-    staffIdList.value = await (await getWithStaffList({})).data
+		staffIdList.value = await (await getWithStaffList({})).data
     }
     setStaffIdList()
     const classIdList = ref([] as any[])
     const setClassIdList = async () => {
-    classIdList.value = await (await getWithClassesList({})).data
+		classIdList.value = await (await getWithClassesList({})).data
     }
     setClassIdList()
 // 表单验证规则

admin/src/addon/zhjw/views/timetables/timetables.vue

@@ -64,8 +64,6 @@
                     
                     <el-table-column prop="courses_id_name" :label="t('coursesId')" min-width="120" :show-overflow-tooltip="true"/>
                     
-                    <el-table-column prop="schedule_date" :label="t('scheduleDate')" min-width="120" :show-overflow-tooltip="true"/>
-                    
                     <el-table-column :label="t('cycle')" min-width="180" align="center" :show-overflow-tooltip="true">
                         <template #default="{ row }">
                             <div v-for="(item, index) in cycleList">

admin/src/addon/zhjw/views/timetables/timetables_edit.vue

@@ -28,8 +28,8 @@
 					</el-select>
 				</el-form-item>
 
-				<el-form-item :label="t('scheduleDate')" prop="schedule_date">
+				<el-form-item label="排班" >
-					<el-calendar v-model="formData.schedule_date">
+					<el-calendar  @click="handleDateClick">
 					</el-calendar>
 				</el-form-item>
 
@@ -50,6 +50,71 @@
 				<el-button @click="back()">{{ t('cancel') }}</el-button>
 			</div>
 		</div>
+
+
+		<el-dialog v-model="dialogVisible" title="排班">
+			<el-form ref="form_ref" :model="schedulesData" label-width="80px" :rules="form_rules">
+				<el-form-item label="选择教练" prop="staff_id">
+					<el-select class="input-width" v-model="schedulesData.staff_id" clearable placeholder="选择教练">
+						<el-option label="请选择" value=""></el-option>
+						<el-option v-for="(item, index) in staffIdList" :key="index" :label="item['name']"
+							:value="item['id']" />
+					</el-select>
+				</el-form-item>
+
+
+				<el-form-item :label="t('classId')" prop="class_id">
+					<el-select class="input-width" v-model="schedulesData.class_id" clearable placeholder="选择班级" disabled>
+						<el-option label="请选择" value=""></el-option>
+						<el-option v-for="(item, index) in classIdList" :key="index" :label="item['name']"
+							:value="item['id']" />
+					</el-select>
+				</el-form-item>
+				
+				
+				<el-form-item :label="t('coursesId')" prop="courses_id">
+					<el-select class="input-width" v-model="schedulesData.courses_id" clearable
+						:placeholder="t('coursesIdPlaceholder')" disabled>
+						<el-option label="请选择" value=""></el-option>
+						<el-option v-for="(item, index) in coursesIdList" :key="index" :label="item['name']"
+							:value="item['id']" />
+					</el-select>
+				</el-form-item>
+
+
+
+				<el-form-item label="排班时间" prop="date_time" class="input-width">
+					<el-input v-model="schedulesData.date_time" clearable placeholder="排班时间" class="input-width" disabled/>
+				</el-form-item>
+
+
+				<el-form-item label="时间段" prop="time_slot">
+					
+					<el-time-picker
+					      v-model="schedulesData.time_slot"
+					      is-range
+					      range-separator="至"
+					      start-placeholder="开始时间"
+					      end-placeholder="结束时间"
+					      format="HH:mm"
+					      value-format="HH:mm"
+					    />
+						
+					<!-- <el-input v-model="schedulesData.time_slot" clearable placeholder="时间段" class="input-width" /> -->
+				</el-form-item>
+
+				<el-form-item label="备注">
+					<el-input v-model="schedulesData.task" type="textarea" rows="4" clearable placeholder="备注"
+						class="input-width" />
+				</el-form-item>
+
+			</el-form>
+			<template #footer>
+				<el-button @click="dialogVisible = false">取消</el-button>
+				<el-button type="primary" @click="submitForm(form_ref)">提交</el-button>
+			</template>
+		</el-dialog>
+
 	</div>
 </template>
 
@@ -59,6 +124,7 @@
 	import { useDictionary } from '@/app/api/dict'
 	import type { FormInstance } from 'element-plus'
 	import { getTimetablesInfo, addTimetables, editTimetables, getWithClassesList, getWithCoursesList } from '@/addon/zhjw/api/timetables';
+	import { getSchedulesInfo, addSchedules, editSchedules, getWithStaffList, getInfo } from '@/addon/zhjw/api/schedules';
 	import { useRoute } from 'vue-router'
 
 	const route = useRoute()
@@ -66,6 +132,102 @@
 	const loading = ref(false)
 	const pageName = route.meta.title
 
+	const dialogVisible = ref(false)
+	
+	const FormData = {
+		id:'',
+		staff_id: '',
+		class_id: '',
+		courses_id:'',
+		date_time: '',
+		time_slot: [],
+		task: ''
+	}
+	
+	const schedulesData : Record<string, any> = reactive({ ...FormData })
+	
+
+	const staffIdList = ref([] as any[])
+	const setStaffIdList = async () => {
+		staffIdList.value = await (await getWithStaffList({})).data
+	}
+	setStaffIdList()
+
+	const handleDateClick = async (event) => {
+		const clickedDate = event.target.textContent.trim()
+		if (!clickedDate || isNaN(clickedDate)) return
+
+		const currentDate = new Date()
+		const selectedDate = `${currentDate.getFullYear()}-${String(currentDate.getMonth() + 1).padStart(2, '0')}-${String(clickedDate).padStart(2, '0')}`
+		
+		const data = await (await getInfo({
+			date_time: selectedDate,
+			class_id: formData.class_id
+		})).data
+		
+
+		Object.assign(schedulesData, initialFormData)
+		
+		Object.keys(schedulesData).forEach((key : string) => {
+			if (data[key] != undefined) schedulesData[key] = data[key]
+		})
+		
+		schedulesData.class_id = formData.class_id
+		schedulesData.courses_id = formData.courses_id
+		schedulesData.date_time = selectedDate
+		
+
+		dialogVisible.value = true
+	}
+
+	const form_rules = computed(() => {
+		return {
+		staff_id: [
+			{ required: true, message: t('staffIdPlaceholder'), trigger: 'blur' },
+			
+		]
+	,
+		class_id: [
+			{ required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
+			
+		]
+	,
+		date_time: [
+			{ required: true, message: t('dateTimePlaceholder'), trigger: 'blur' },
+			
+		]
+	,
+		time_slot: [
+			{ required: true, message: t('timeSlotPlaceholder'), trigger: 'blur' },
+			
+		]
+	,
+		task: [
+			{ required: true, message: t('taskPlaceholder'), trigger: 'blur' },
+			
+		]
+	,
+		}
+	})
+
+
+	const submitForm = async (formEl: FormInstance | undefined) => {
+
+		if (loading.value || !formEl) return
+		await formEl.validate(async (valid) => {
+		   if (valid) {
+			   let data = schedulesData
+			   const save = schedulesData['id'] ? editSchedules : addSchedules
+			   save(data).then(res => {
+				   dialogVisible.value = false
+			   }).catch(err => {
+				   dialogVisible.value = false
+			   })
+
+		   }
+		})
+	}
+
 	let formatDate = (date) => {
 		if (typeof date === 'string') {
 			date = new Date(date);
@@ -91,7 +253,6 @@
 		id: 0,
 		class_id: '',
 		courses_id: '',
-		schedule_date: '',
 		cycle: '',
 
 	}
@@ -107,6 +268,8 @@
 	if (id) setFormData(id);
 
 	const formRef = ref<FormInstance>()
+	const form_ref = ref<FormInstance>()
+	
 	// 选中数据
 	const selectData = ref<any[]>([])
 
@@ -141,11 +304,6 @@
 			courses_id: [
 				{ required: true, message: t('coursesIdPlaceholder'), trigger: 'blur' },
 
-			]
-			,
-			schedule_date: [
-				{ required: true, message: t('scheduleDatePlaceholder'), trigger: 'blur' },
-
 			]
 			,
 			cycle: [
@@ -163,7 +321,6 @@
 				loading.value = true
 				let data = formData
 
-				data['schedule_date'] = formatDate(data.schedule_date);
 				const save = id ? editTimetables : addTimetables
 				save(data).then(res => {
 					loading.value = false

niucloud/addon/zhjw/app/adminapi/controller/schedules/Schedules.php

@@ -46,6 +46,16 @@ class Schedules extends BaseAdminController
         return success((new SchedulesService())->getInfo($id));
     }
 
+    public function get_info(){
+        $data = $this->request->params([
+            ["class_id",""],
+            ["date_time",'']
+        ]);
+
+        return success((new SchedulesService())->get_info($data));
+    }
+
+
     /**
      * 添加排班管理
      * @return \think\Response
@@ -54,8 +64,9 @@ class Schedules extends BaseAdminController
         $data = $this->request->params([
              ["staff_id",0],
              ["class_id",0],
-             ["date_time","2025-03-06 15:10:47"],
+             ["courses_id",0],
-             ["time_slot",""],
+             ["date_time",""],
+             ["time_slot",[]],
              ["task",""],
 
         ]);
@@ -73,7 +84,8 @@ class Schedules extends BaseAdminController
         $data = $this->request->params([
              ["staff_id",0],
              ["class_id",0],
-             ["date_time","2025-03-06 15:10:47"],
+             ["courses_id",0],
+             ["date_time",""],
              ["time_slot",""],
              ["task",""],
 
@@ -93,7 +105,7 @@ class Schedules extends BaseAdminController
         return success('DELETE_SUCCESS');
     }
 
-    
+
     public function getStaffAll(){
          return success(( new SchedulesService())->getStaffAll());
     }

niucloud/addon/zhjw/app/adminapi/controller/timetables/Timetables.php

@@ -52,7 +52,6 @@ class Timetables extends BaseAdminController
         $data = $this->request->params([
              ["class_id",0],
              ["courses_id",0],
-             ["schedule_date",""],
              ["cycle",""]
         ]);
         $this->validate($data, 'addon\zhjw\app\validate\timetables\Timetables.add');
@@ -69,7 +68,6 @@ class Timetables extends BaseAdminController
         $data = $this->request->params([
              ["class_id",0],
              ["courses_id",0],
-             ["schedule_date",""],
              ["cycle",""]
         ]);
         $this->validate($data, 'addon\zhjw\app\validate\timetables\Timetables.edit');
@@ -87,7 +85,7 @@ class Timetables extends BaseAdminController
         return success('DELETE_SUCCESS');
     }
 
-    
+
     public function getClassesAll(){
          return success(( new TimetablesService())->getClassesAll());
     }

niucloud/addon/zhjw/app/adminapi/route/route.php

@@ -187,6 +187,8 @@ Route::group('zhjw', function () {
     Route::get('schedules', 'addon\zhjw\app\adminapi\controller\schedules\Schedules@lists');
     //排班管理详情
     Route::get('schedules/:id', 'addon\zhjw\app\adminapi\controller\schedules\Schedules@info');
+
+    Route::get('get_info', 'addon\zhjw\app\adminapi\controller\schedules\Schedules@get_info');
     //添加排班管理
     Route::post('schedules', 'addon\zhjw\app\adminapi\controller\schedules\Schedules@add');
     //编辑排班管理
@@ -220,7 +222,7 @@ Route::group('zhjw', function () {
     Route::put('timetables/:id', 'addon\zhjw\app\adminapi\controller\timetables\Timetables@edit');
     //删除课表管理
     Route::delete('timetables/:id', 'addon\zhjw\app\adminapi\controller\timetables\Timetables@del');
-    
+
     Route::get('classes_all','addon\zhjw\app\adminapi\controller\timetables\Timetables@getClassesAll');
 
     Route::get('courses_all','addon\zhjw\app\adminapi\controller\timetables\Timetables@getCoursesAll');
@@ -246,7 +248,7 @@ Route::group('zhjw', function () {
     Route::put('sales/:id', 'addon\zhjw\app\adminapi\controller\sales\Sales@edit');
     //删除销售管理
     Route::delete('sales/:id', 'addon\zhjw\app\adminapi\controller\sales\Sales@del');
-    
+
     Route::get('staff_all','addon\zhjw\app\adminapi\controller\sales\Sales@getStaffAll');
 
     Route::get('sys_area_all','addon\zhjw\app\adminapi\controller\sales\Sales@getSysAreaAll');
@@ -272,7 +274,7 @@ Route::group('zhjw', function () {
     Route::put('follow_up_logs/:id', 'addon\zhjw\app\adminapi\controller\follow_up_logs\FollowUpLogs@edit');
     //删除跟进管理
     Route::delete('follow_up_logs/:id', 'addon\zhjw\app\adminapi\controller\follow_up_logs\FollowUpLogs@del');
-    
+
     Route::get('sales_all','addon\zhjw\app\adminapi\controller\follow_up_logs\FollowUpLogs@getSalesAll');
 
     Route::get('staff_all','addon\zhjw\app\adminapi\controller\follow_up_logs\FollowUpLogs@getStaffAll');
@@ -299,7 +301,7 @@ Route::group('zhjw', function () {
     Route::put('follow_up_reminders/:id', 'addon\zhjw\app\adminapi\controller\follow_up_reminders\FollowUpReminders@edit');
     //删除跟进提醒管理
     Route::delete('follow_up_reminders/:id', 'addon\zhjw\app\adminapi\controller\follow_up_reminders\FollowUpReminders@del');
-    
+
     Route::get('follow_up_logs_all','addon\zhjw\app\adminapi\controller\follow_up_reminders\FollowUpReminders@getFollowUpLogsAll');
 
 })->middleware([
@@ -323,7 +325,7 @@ Route::group('zhjw', function () {
     Route::put('classes/:id', 'addon\zhjw\app\adminapi\controller\classes\Classes@edit');
     //删除班级管理
     Route::delete('classes/:id', 'addon\zhjw\app\adminapi\controller\classes\Classes@del');
-    
+
     Route::get('venues_all','addon\zhjw\app\adminapi\controller\classes\Classes@getVenuesAll');
 
     Route::get('students_all','addon\zhjw\app\adminapi\controller\classes\Classes@getStudentsAll');
@@ -349,7 +351,7 @@ Route::group('zhjw', function () {
     Route::put('feedback/:id', 'addon\zhjw\app\adminapi\controller\feedback\Feedback@edit');
     //删除意见反馈
     Route::delete('feedback/:id', 'addon\zhjw\app\adminapi\controller\feedback\Feedback@del');
-    
+
     Route::get('students_all','addon\zhjw\app\adminapi\controller\feedback\Feedback@getStudentsAll');
 
 })->middleware([
@@ -373,7 +375,7 @@ Route::group('zhjw', function () {
     Route::put('students/:id', 'addon\zhjw\app\adminapi\controller\students\Students@edit');
     //删除学员管理
     Route::delete('students/:id', 'addon\zhjw\app\adminapi\controller\students\Students@del');
-    
+
     Route::get('staff_all','addon\zhjw\app\adminapi\controller\students\Students@getStaffAll');
 
 })->middleware([
@@ -399,7 +401,7 @@ Route::group('zhjw', function () {
     Route::put('staff/:id', 'addon\zhjw\app\adminapi\controller\staff\Staff@edit');
     //删除人员管理
     Route::delete('staff/:id', 'addon\zhjw\app\adminapi\controller\staff\Staff@del');
-    
+
     Route::get('member_all','addon\zhjw\app\adminapi\controller\staff\Staff@getMemberAll');
 
 })->middleware([

niucloud/addon/zhjw/app/service/admin/schedules/SchedulesService.php

@@ -59,6 +59,15 @@ class SchedulesService extends BaseAdminService
         return $info;
     }
 
+
+    public function get_info(array $data)
+    {
+        $field = 'id,staff_id,class_id,courses_id,date_time,time_slot,task';
+        $info = $this->model->field($field)->where($data)->findOrEmpty()->toArray();
+        $info['time_slot'] = explode(",",$info['time_slot']);
+        return $info;
+    }
+
     /**
      * 添加排班管理
      * @param array $data
@@ -66,6 +75,7 @@ class SchedulesService extends BaseAdminService
      */
     public function add(array $data)
     {
+        $data['time_slot'] = implode(",",$data['time_slot']);
         $res = $this->model->create($data);
         return $res->id;
 
@@ -79,7 +89,7 @@ class SchedulesService extends BaseAdminService
      */
     public function edit(int $id, array $data)
     {
-
+        $data['time_slot'] = implode(",",$data['time_slot']);
         $this->model->where([['id', '=', $id]])->update($data);
         return true;
     }
@@ -96,7 +106,7 @@ class SchedulesService extends BaseAdminService
         return $res;
     }
 
-    
+
     public function getStaffAll(){
        $staffModel = new Staff();
        return $staffModel->select()->toArray();

niucloud/addon/zhjw/app/service/admin/timetables/TimetablesService.php

@@ -38,7 +38,7 @@ class TimetablesService extends BaseAdminService
      */
     public function getPage(array $where = [])
     {
-        $field = 'id,is_deleted,created_by,created_role,created_time,updated_by,updated_role,updated_time,class_id,courses_id,schedule_date,cycle';
+        $field = 'id,is_deleted,created_by,created_role,created_time,updated_by,updated_role,updated_time,class_id,courses_id,cycle';
         $order = 'id desc';
 
         $search_model = $this->model->withSearch(["class_id","courses_id","cycle"], $where)->with(['classes','courses'])->field($field)->order($order);
@@ -53,7 +53,7 @@ class TimetablesService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,is_deleted,created_by,created_role,created_time,updated_by,updated_role,updated_time,class_id,courses_id,schedule_date,cycle';
+        $field = 'id,is_deleted,created_by,created_role,created_time,updated_by,updated_role,updated_time,class_id,courses_id,cycle';
 
         $info = $this->model->field($field)->where([['id', "=", $id]])->with(['classes','courses'])->findOrEmpty()->toArray();
    $info['cycle'] = strval($info['cycle']);
@@ -97,7 +97,7 @@ class TimetablesService extends BaseAdminService
         return $res;
     }
 
-    
+
     public function getClassesAll(){
        $classesModel = new Classes();
        return $classesModel->select()->toArray();

niucloud/addon/zhjw/app/validate/timetables/Timetables.php

@@ -22,20 +22,18 @@ class Timetables extends BaseValidate
        protected $rule = [
             'class_id' => 'require',
             'courses_id' => 'require',
-            'schedule_date' => 'require',
             'cycle' => 'require',
         ];
 
        protected $message = [
             'class_id.require' => ['common_validate.require', ['class_id']],
             'courses_id.require' => ['common_validate.require', ['courses_id']],
-            'schedule_date.require' => ['common_validate.require', ['schedule_date']],
             'cycle.require' => ['common_validate.require', ['cycle']],
         ];
 
        protected $scene = [
-            "add" => ['class_id', 'courses_id', 'schedule_date', 'cycle'],
+            "add" => ['class_id', 'courses_id', 'cycle'],
-            "edit" => ['class_id', 'courses_id', 'schedule_date', 'cycle']
+            "edit" => ['class_id', 'courses_id', 'cycle']
         ];
 
 }

niucloud/app/api/controller/member/Member.php

@@ -146,6 +146,13 @@ class Member extends BaseApiController
         return success(( new MemberService() )->course_list($data));
     }
 
+    public function course_info(){
+        $data = $this->request->params([
+            [ 'id', '' ]
+        ]);
+        return success(( new MemberService() )->course_info($data));
+    }
+
     public function venues_list(){
         $data = $this->request->params([
             [ 'schedule_date', '' ]

niucloud/app/api/route/member.php

@@ -112,6 +112,8 @@ Route::group('member', function () {
 
     Route::get('course_list', 'member.Member/course_list');
 
+    Route::get('course_info', 'member.Member/course_info');
+
     Route::get('venues_list', 'member.Member/venues_list');
 
     Route::post('students_sign_list', 'member.Member/students_sign_list');

niucloud/app/service/api/member/MemberService.php

@@ -14,6 +14,7 @@ namespace app\service\api\member;
 use addon\zhjw\app\model\assignments\Assignments;
 use addon\zhjw\app\model\classes\Classes;
 use addon\zhjw\app\model\courses\Courses;
+use addon\zhjw\app\model\schedules\Schedules;
 use addon\zhjw\app\model\staff\Staff;
 use addon\zhjw\app\model\students\Students;
 use addon\zhjw\app\model\timetables\Timetables;
@@ -289,33 +290,29 @@ class MemberService extends BaseApiService
         $member_info = $this->getInfo();
         $venues = new Venues();
         $classes = new Classes();
+        $schedules = new Schedules();
         $where = [];
         if($data['venue_id']){
             $venue_id = $data['venue_id'];
-            $where['a.venue_id'] = $venue_id;
+            $where['c.id'] = $venue_id;
         }else{
             $venue_id = $this->get_venues_ids($data)[0];
-            $where['a.venue_id'] = $venue_id;
+            $where['c.id'] = $venue_id;
         }
-
+        $where['a.date_time'] = $data['schedule_date'];
-        $search_model = $classes
+        $search_model = $schedules
             ->alias("a")
-            ->join(['school_venues' => 'b'],'a.venue_id = b.id','left')
+            ->join(['school_classes' => 'b'],'a.class_id = b.id','left')
-            ->join(['school_timetables' => 'c'],'a.id = c.class_id','left')
+            ->join(['school_venues' => 'c'],'b.venue_id = c.id','left')
-            ->join(['school_courses' => 'd'],'c.courses_id = d.id','left')
+            ->join(['school_courses' => 'd'],'a.courses_id = d.id','left')
-            ->where('a.start_date', '<=', $data['schedule_date'])
-            ->where('a.end_date', '>=', $data['schedule_date'])
             ->where($where)
-            ->where('a.status','<',3)
+            ->whereRaw("FIND_IN_SET(?, b.max_students)", [$member_info['students_id']])
-            ->whereRaw("FIND_IN_SET(?, a.max_students)", [$member_info['students_id']])
+            ->field("a.id,b.name as classes_name,a.date_time,a.time_slot,c.name as address,d.name as courses_name,d.id as courses_id,LENGTH(b.max_students) - LENGTH(REPLACE(b.max_students, ',', '')) + 1 as students_count,b.max_students");
-            ->field("a.id,a.status,a.venue_id,a.start_date,a.end_date,a.max_students,a.name,b.name as address,d.name as courses_name,
-                LENGTH(a.max_students) - LENGTH(REPLACE(a.max_students, ',', '')) + 1 as students_count,d.id as courses_id
-            ")
-            ->group("a.venue_id");
 
 
         $list = $this->pageQuery($search_model, function ($item)  use($member_info){
             $where['a.students_id'] = $member_info['students_id'];
+            $where['a.courses_id'] = $item['courses_id'];
             $item['sign_list'] =  Db::name("zhjw_students_sign")
                 ->alias("a")
                 ->join(['school_zhjw_students' => 'b'],'a.students_id = b.id','left')
@@ -329,8 +326,8 @@ class MemberService extends BaseApiService
 
             $has_sign = Db::name("zhjw_students_sign")->where(['courses_id' => $item['courses_id']])->count();
             $item['has_sign_count'] = $has_sign;
-
+            $time = explode(",",$item['time_slot']);
-            $item['date'] = formatTimeRange($item['start_date'], $item['end_date']);
+            $item['date'] = $item['date_time'].' '.$time[0].' - '.$time[1];
         });
 
 
@@ -338,6 +335,41 @@ class MemberService extends BaseApiService
         return ['list' => $list,'venues_info' => $info];
     }
 
+
+    public function course_info($data){
+        $member_info = $this->getInfo();
+        $schedules = new Schedules();
+        $where = [];
+        $where['a.id'] = $data['id'];
+
+        $info = $schedules
+            ->alias("a")
+            ->join(['school_classes' => 'b'],'a.class_id = b.id','left')
+            ->join(['school_venues' => 'c'],'b.venue_id = c.id','left')
+            ->join(['school_courses' => 'd'],'a.courses_id = d.id','left')
+            ->join(['school_staff' => 'e'],'a.staff_id = e.id','left')
+            ->where($where)
+            ->field("
+                a.id,b.name as classes_name,a.date_time,a.time_slot,c.name as address,
+                d.name as courses_name,
+                d.id as courses_id,LENGTH(b.max_students) - LENGTH(REPLACE(b.max_students, ',', '')) + 1 as students_count,
+                b.max_students,e.name as staff_name,e.phone as staff_phone
+            ")
+            ->find()->toArray();
+        $time = explode(",",$info['time_slot']);
+
+        $startTime = strtotime($time[0]);
+        $endTime = strtotime($time[1]);
+
+        $diffInSeconds = $endTime - $startTime;
+
+        $diffInHours = $diffInSeconds / 3600;
+
+        $info['hour'] = $diffInHours;
+
+        return $info;
+    }
+
     public function getDate()
     {
         $dates = [];