增加接口获取所有的升学方式

@@ -7,6 +7,7 @@ use app\api\model\Graduated;
 use app\api\model\LikeUniversity;
 use app\api\model\School;
 use app\api\model\Student;
+use app\api\model\Subject;
 use app\api\model\University as UniversityModel;
 use app\api\model\UniversityLevel;
 use app\api\model\Up;
@@ -444,4 +445,23 @@ class University extends Api
         $this->success('获取所有的升学方式成功', $upList);
     }
 
+
+
+    /**
+     * 获取选考科目
+     * @ApiTitle    (获取选考科目)
+     * @ApiSummary  (获取选考科目)
+     * @ApiMethod   (GET)
+     * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
+     * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
+     * @ApiReturnParams   (name="data", type="object", sample="{'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}", description="扩展数据返回")
+     * @ApiReturn   (获取选考科目)
+     */
+    public function listSubject()
+    {
+        $subject = new Subject();
+        $subjectList = $subject->listAll();
+        $this->success('获取选考科目', $subjectList);
+    }
+
 }

@@ -21,4 +21,10 @@ class Subject extends Model
         return $this->where(['id' => ['in', $ids], 'show_switch' => ['=', 1]])->useSoftDelete($this->deleteTime)->order('weigh', 'desc')->select();
     }
 
+
+    // 获取所有
+    public function listAll()
+    {
+        return $this->where(['show_switch' => ['=', 1]])->useSoftDelete($this->deleteTime)->order('weigh', 'desc')->select();
+    }
 }
\ No newline at end of file