Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt

niucloud/app/api/controller/apiController/ClassApi.php

@@ -13,6 +13,7 @@ namespace app\api\controller\apiController;
 
 use app\Request;
 use app\service\api\apiService\jlClassService;
+use app\service\api\apiService\PhysicalTestService;
 use core\base\BaseApiService;
 
 
@@ -49,5 +50,65 @@ class ClassApi extends BaseApiService
         return success('获取成功',(new jlClassService())->jlStudentsInfo($data['students_id']));
     }
 
+    //体测列表
+    public function PhysicalTestList(Request $request){
+        $data = $this->request->params([
+            ["user_id",0]
+        ]);
+        return success('获取成功',(new jlClassService())->PhysicalTestList($data['user_id']));
+    }
+
+    //体测详情
+    public function PhysicalTestInfo(Request $request)
+    {
+        $id = $request->param('survey_id', '');//体测报告的id
+        if (empty($id)) {
+            return fail('缺少参数');
+        }
+        $where = [
+            'id' => $id,
+        ];
+        $res = (new PhysicalTestService())->getInfo($where);
+        if(!$res['code']){
+            return fail($res['msg']);
+        }
+        return success($res['data']);
+    }
+
+    //添加作业-获取班级列表
+    public function jlGetClassesList(Request $request)
+    {
+        return success((new jlClassService())->GetClassesList());
+    }
+
+    //添加作业-获取课程列表
+    public function jlGetCoursesList(Request $request)
+    {
+        return success((new jlClassService())->GetCoursesList());
+    }
+
+    //添加作业-学员列表
+    public function jlGetStudentList(Request $request)
+    {
+        return success((new jlClassService())->GetStudentList());
+    }
+
+    //添加作业
+    public function addJlPublishJob(Request $request)
+    {
+        $data = $this->request->params([
+            ["class_id",0],
+            ["classes_id_name",''],
+            ["content_text",''],
+            ["content_type",''],
+            ["course_id",0],
+            ["course_id_name",''],
+            ["student_id",''],
+            ["students_ids_name",''],
+            ["type",''],
+        ]);
+        return success('操作成功', (new jlClassService())->addPublishJob($data));
+    }
+
 
 }

niucloud/app/api/route/route.php

@@ -278,14 +278,18 @@ Route::group(function () {
 
 
 
-
+    //添加作业
-
+    Route::get('class/jlPublishJob/add', 'apiController.classApi/addJlPublishJob');
-
+    //添加作业-获取课程列表
-
+    Route::get('class/jlGetStudentList/list', 'apiController.classApi/jlGetStudentList');
-
+    //添加作业-获取课程列表
-
+    Route::get('class/jlGetCoursesList/list', 'apiController.classApi/jlGetCoursesList');
-
+    //添加作业-获取班级列表
-
+    Route::get('class/jlGetClasses/list', 'apiController.classApi/jlGetClassesList');
+    //体测报告-列表
+    Route::get('class/physicalTest', 'apiController.classApi/PhysicalTestList');
+    //体测报告-详情
+    Route::get('class/physicalTest/info', 'apiController.classApi/PhysicalTestInfo');
     //获取学员详情
     Route::get('class/jlStudentsInfo', 'apiController.classApi/jlStudentsInfo');
     //班级课程列表

niucloud/app/service/api/apiService/jlClassService.php

@@ -13,6 +13,8 @@ namespace app\service\api\apiService;
 
 use app\model\class_grade\ClassGrade;
 use app\model\student\Student;
+use app\model\assignment\Assignment;
+use app\model\course\Course;
 use core\base\BaseApiService;
 
 /**
@@ -109,12 +111,46 @@ class jlClassService extends BaseApiService
             }]);
         }]);
         $res = $res->find();
+        return $res;
+    }
 
+    public function PhysicalTestList($data)
+    {
+        $resource_id = $data;
+        $where = [
+            'resource_id' => $resource_id,
+        ];
+        $physical_test = (new PhysicalTestService())->getList($where);
+        $res['physical_test'] = $physical_test;
+        return $res;
+    }
 
+    public function GetClassesList()
+    {
+        $res = $this->model->where('status',1)->select()->toArray();
+        return $res;
+    }
 
+    public function GetCoursesList()
+    {
+        $Course = new Course();
+        $res = $Course->select()->toArray();
+        return $res;
+    }
 
+    public function GetStudentList()
+    {
+        $Student = new Student();
+        $res = $Student->where('status', 1)->select()->toArray();
+        return $res;
+    }
 
-
+    public function addPublishJob($data)
+    {
+        $Assignment = new Assignment();
+        $res = $Assignment->create($data);
         return $res;
     }
+
+
 }