From 71137012a95649d6af9f0bd8296fee0a94d54d9d Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Wed, 4 Jun 2025 11:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/school_approval/process/index.vue   |  2 +-
 .../PersonCourseSchedule.php                  | 16 ++--
 .../PersonCourseSchedule.php                  | 78 ++++++++++++++++++-
 3 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/admin/src/app/views/school_approval/process/index.vue b/admin/src/app/views/school_approval/process/index.vue
index 35528d7a..e1e95ea6 100644
--- a/admin/src/app/views/school_approval/process/index.vue
+++ b/admin/src/app/views/school_approval/process/index.vue
@@ -5,7 +5,7 @@
         <div>
           <el-button type="primary" @click="handleCreate">
             <icon name="add" class="mr-5px" />
-            {{ '创建' }}
+            {{ '创建(测试暂留)' }}
           </el-button>
         </div>
         <div class="flex items-center">
diff --git a/niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php b/niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php
index c96aa60d..9a07a94d 100644
--- a/niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php
+++ b/niucloud/app/adminapi/controller/person_course_schedule/PersonCourseSchedule.php
@@ -50,14 +50,11 @@ class PersonCourseSchedule extends BaseAdminController
      */
     public function add(){
         $data = $this->request->params([
-             ["person_id",0],
-             ["person_type",""],
+             ["resources_id",[]],
              ["schedule_id",0],
-             ["course_date","2025-05-29 17:03:27"],
-             ["time_slot",""],
+             ["student_ids",[]],
 
         ]);
-        $this->validate($data, 'app\validate\person_course_schedule\PersonCourseSchedule.add');
         $id = (new PersonCourseScheduleService())->add($data);
         return success('ADD_SUCCESS', ['id' => $id]);
     }
@@ -69,14 +66,11 @@ class PersonCourseSchedule extends BaseAdminController
      */
     public function edit(int $id){
         $data = $this->request->params([
-             ["person_id",0],
-             ["person_type",""],
-             ["schedule_id",0],
-             ["course_date","2025-05-29 17:03:27"],
-             ["time_slot",""],
+            ["resources_id",[]],
+            ["schedule_id",0],
+            ["student_ids",[]],
 
         ]);
-        $this->validate($data, 'app\validate\person_course_schedule\PersonCourseSchedule.edit');
         (new PersonCourseScheduleService())->edit($id, $data);
         return success('EDIT_SUCCESS');
     }
diff --git a/niucloud/app/model/person_course_schedule/PersonCourseSchedule.php b/niucloud/app/model/person_course_schedule/PersonCourseSchedule.php
index e6bd524c..e547d1ae 100644
--- a/niucloud/app/model/person_course_schedule/PersonCourseSchedule.php
+++ b/niucloud/app/model/person_course_schedule/PersonCourseSchedule.php
@@ -11,6 +11,8 @@
 
 namespace app\model\person_course_schedule;
 
+use app\model\personnel\Personnel;
+use app\model\student\Student;
 use core\base\BaseModel;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
@@ -40,7 +42,19 @@ class PersonCourseSchedule extends BaseModel
 
 
     /**
-     * 搜索器:人员与课程安排关系资源
+     * 搜索器:人员与课程安排关系关系编号
+     * @param $value
+     * @param $data
+     */
+    public function searchIdAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("id", $value);
+        }
+    }
+
+    /**
+     * 搜索器:人员与课程安排关系人员或资源ID
      * @param $value
      * @param $data
      */
@@ -51,13 +65,71 @@ class PersonCourseSchedule extends BaseModel
         }
     }
 
+    /**
+     * 搜索器:人员与课程安排关系人员类型: student-正式学员, customer_resource-客户资源
+     * @param $value
+     * @param $data
+     */
+    public function searchPersonTypeAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("person_type", $value);
+        }
+    }
+
+    /**
+     * 搜索器:人员与课程安排关系课程安排ID
+     * @param $value
+     * @param $data
+     */
+    public function searchScheduleIdAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("schedule_id", $value);
+        }
+    }
+
+    /**
+     * 搜索器:人员与课程安排关系上课日期
+     * @param $value
+     * @param $data
+     */
+    public function searchCourseDateAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("course_date", $value);
+        }
+    }
 
+    /**
+     * 搜索器:人员与课程安排关系上课时段
+     * @param $value
+     * @param $data
+     */
+    public function searchTimeSlotAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("time_slot", $value);
+        }
+    }
 
 
+    public function person()
+    {
+        return $this->hasOne(Personnel::class, 'id', 'person_id');
+    }
 
+    public function student()
+    {
+        return $this->hasOne(Student::class, 'id', 'student_id');
+    }
 
-    public function customerResources(){
-       return $this->hasOne(CustomerResources::class, 'id', 'person_id')->joinType('left')->withField('name,id')->bind(['person_id_name'=>'name']);
+    public function resources()
+    {
+        return $this->hasOne(CustomerResources::class, 'id', 'resources_id');
     }
 
+    public function customerResources(){
+        return $this->hasOne(CustomerResources::class, 'id', 'person_id')->joinType('left')->withField('name,id')->bind(['person_id_name'=>'name']);
+    }
 }