修改班级和排课

niucloud/app/adminapi/route/class.php

@@ -57,8 +57,6 @@ Route::group('class', function () {
 
     Route::get('personnel_all','class.Class/getPersonnelAll');
 
-    Route::get('personnel_all','class.Class/getPersonnelAll');
-
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/adminapi/route/classroom.php

@@ -33,8 +33,6 @@ Route::group('classroom', function () {
 
     Route::get('personnel_all','classroom.Classroom/getPersonnelAll');
 
-    Route::get('personnel_all','classroom.Classroom/getPersonnelAll');
-
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/common.php

@@ -1028,7 +1028,8 @@ function get_last_time($time = null)
     return $text;
 }
 
-function get_campus_where($user_id){
+function get_campus_where($user_id)
+{
     $where = [];
     if ($user_id == 1) {
         return $where;
@@ -1074,3 +1075,13 @@ function getModifiedFields(array $oldData, array $newData): array
         'new_values' => json_encode($newValues, JSON_UNESCAPED_UNICODE),
     ];
 }
+
+// 获取员工编号
+function getEmployeeNumber()
+{
+    $personnel = new Personnel();
+    // 获取最新id
+    $max_id = $personnel->max('id') + 1;
+    $max_id = str_pad($max_id, 5, '0', STR_PAD_LEFT);
+    return date('Ymd') . $max_id;
+}

niucloud/app/model/classroom/Classroom.php

@@ -15,12 +15,9 @@ use core\base\BaseModel;
 use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
-
 use app\model\campus\Campus;
-
 use app\model\personnel\Personnel;
 
-use app\model\personnel\Personnel;
 
 /**
  * 场地管理模型
@@ -140,11 +137,6 @@ class Classroom extends BaseModel
         }
     }
 
-    
-
-    
-
-    
     public function campus(){
        return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_id_name'=>'campus_name']);
     }
@@ -153,8 +145,4 @@ class Classroom extends BaseModel
        return $this->hasOne(Personnel::class, 'id', 'head_coach')->joinType('left')->withField('name,id')->bind(['head_coach_name'=>'name']);
     }
 
-    public function personnel(){
-       return $this->hasOne(Personnel::class, 'id', 'assistant_coach')->joinType('left')->withField('name,id')->bind(['assistant_coach_name'=>'name']);
-    }
-
 }

niucloud/app/service/admin/classroom/ClassroomService.php

@@ -14,7 +14,6 @@ namespace app\service\admin\classroom;
 use app\model\classroom\Classroom;
 use app\model\campus\Campus;
 use app\model\personnel\Personnel;
-use app\model\personnel\Personnel;
 
 use core\base\BaseAdminService;
 
@@ -109,10 +108,5 @@ class ClassroomService extends BaseAdminService
        return $personnelModel->select()->toArray();
     }
 
-    public function getPersonnelAll(){
-       $personnelModel = new Personnel();
-       return $personnelModel->select()->toArray();
-    }
-
 
 }

niucloud/app/service/admin/personnel/PersonnelService.php

@@ -88,6 +88,8 @@ class PersonnelService extends BaseAdminService
                 ]);
                 $data['sys_user_id'] = $uid;
             }
+//            员工编号
+            $data['employee_number'] = getEmployeeNumber();
             $res = $this->model->create($data);
             Db::commit();
             return $res->id;