From 8d8ab0e3c6e807ea5fc68718f4105af8de78e67c Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 6 Jun 2025 16:48:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(api):=20=E5=A2=9E=E5=8A=A0=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E8=AF=BE=E7=A8=8B=E5=AE=89=E6=8E=92=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加上课日期和场地 ID 筛选参数
- 优化状态筛选逻辑，处理关联表查询
-调整列表接口返回数据格式
---
 .../apiController/PersonCourseSchedule.php          |  7 ++++++-
 .../api/apiService/PersonCourseScheduleService.php  | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/niucloud/app/api/controller/apiController/PersonCourseSchedule.php b/niucloud/app/api/controller/apiController/PersonCourseSchedule.php
index 514d3d5a..73ee558d 100644
--- a/niucloud/app/api/controller/apiController/PersonCourseSchedule.php
+++ b/niucloud/app/api/controller/apiController/PersonCourseSchedule.php
@@ -24,11 +24,14 @@ use function DI\string;
 class PersonCourseSchedule extends BaseApiService
 {
 
-    //列表
+    //列表(人员与课程安排关系表)
     public function index(Request $request)
     {
         $resources_id = $request->param('resources_id', '');//客户资源ID
         $status = $request->param('status', '');//状态0待上课1已上课2请假
+        $course_date = $request->param('course_date', '');//上课日期Y-m-d
+        $venue_id = $request->param('venue_id', '');//场地ID
+
         if (empty($resources_id)) {
             return fail('缺少参数');
         }
@@ -36,6 +39,8 @@ class PersonCourseSchedule extends BaseApiService
         $where = [
             'resources_id' => $resources_id,
             'status' => $status,
+            'course_date' => $course_date,
+            'venue_id' => $venue_id,
         ];
 
         $res = (new PersonCourseScheduleService())->getList($where);
diff --git a/niucloud/app/service/api/apiService/PersonCourseScheduleService.php b/niucloud/app/service/api/apiService/PersonCourseScheduleService.php
index 3e223ddb..b54f70f0 100644
--- a/niucloud/app/service/api/apiService/PersonCourseScheduleService.php
+++ b/niucloud/app/service/api/apiService/PersonCourseScheduleService.php
@@ -42,9 +42,20 @@ class PersonCourseScheduleService extends BaseApiService
             $model = $model->where('resources_id', $where['resources_id']);
         }
 
+        //上课日期
+        if (!empty($where['course_date'])) {
+            $model = $model->where('course_date', $where['course_date']);
+        }
+
         //判断有没有客户上课状态
         if (array_key_exists('status', $where) && $where['status'] != '') {
-            $model = $model->where('status', $where['status']);
+//            $model = $model->where('status', $where['status']);
+            $model = $model->where('school_person_course_schedule.status', $where['status']);
+        }
+
+        // 判断有没有场地ID
+        if (!empty($where['venue_id'])) {
+            $model = $model->hasWhere('courseScheduleHasOne', ['venue_id' => $where['venue_id']]);
         }
 
         $data = $model->order('course_date','desc')