import

app/Http/Controllers/Admin/Major/InfoController.php

@@ -178,24 +178,25 @@ class InfoController extends Controller
                         foreach ($data as $k1 => $v1) {
 
                             foreach ($v1 as $k2 => $v2) {
-                                $a[$k1]['year'] = $v2['年度'];
-                                $a[$k1]['class'] = $v2['科类'];
-                                $a[$k1]['batch'] = $v2['批次'];
-                                $a[$k1]['level'] = $v2['层次'];
-                                $a[$k1]['type'] = $v2['类别'];
-                                $a[$k1]['college'] = $v2['院校'];
-                                $a[$k1]['province'] = $v2['所在省份'];
-                                $a[$k1]['city'] = $v2['所在地市'];
-                                $a[$k1]['major'] = $v2['专业'];
-                                $a[$k1]['comment'] = $v2['专业备注'];
-                                $a[$k1]['min_grade'] = $v2['最低分'];
-                                $a[$k1]['avg_grade'] = $v2['平均分'];
-                                $a[$k1]['max_grade'] = $v2['最高分'];
-                                $a[$k1]['batch_grade'] = $v2['批次线'];
-                                $a[$k1]['miss_grade'] = $v2['线差'];
-                                $a[$k1]['min_rank'] = $v2['最低位次'];
-                                $a[$k1]['max_rank'] = $v2['最高位次'];
-                                $a[$k1]['avg_rank'] = $v2['平均位次'];
+                                $a[$k1]['year'] = $v2['年度']?$v2['年度']:'';
+                                $a[$k1]['class'] = $v2['科类']?$v2['科类']:'';
+                                $a[$k1]['batch'] = $v2['批次']?$v2['批次']:'';
+                                $a[$k1]['level'] = $v2['层次']?$v2['层次']:'';
+                                $a[$k1]['type'] = $v2['类别']?$v2['类别']:'';
+                                $a[$k1]['college'] = $v2['院校']?$v2['院校']:'';
+                                $a[$k1]['province'] = $v2['所在省份']?$v2['所在省份']:'
+                                ';
+                                $a[$k1]['city'] = $v2['所在地市']?$v2['所在地市']:'';
+                                $a[$k1]['major'] = $v2['专业']?$v2['专业']:'';
+                                $a[$k1]['comment'] = $v2['专业备注']?$v2['专业备注']:'';
+                                $a[$k1]['min_grade'] = $v2['最低分']?$v2['最低分']:'';
+                                $a[$k1]['avg_grade'] = $v2['平均分']?$v2['平均分']:'';
+                                $a[$k1]['max_grade'] = $v2['最高分']?$v2['最高分']:'';
+                                $a[$k1]['batch_grade'] = $v2['批次线']?$v2['批次线']:'';
+                                $a[$k1]['miss_grade'] = $v2['线差']?$v2['线差']:'';
+                                $a[$k1]['min_rank'] = $v2['最低位次']?$v2['最低位次']:'';
+                                $a[$k1]['max_rank'] = $v2['最高位次']?$v2['最高位次']:'';
+                                $a[$k1]['avg_rank'] = $v2['平均位次']?$v2['平均位次']:'';
 
                                 $a[$k1]['created_at'] = date('Y-m-d H:i:s', time());
                                 $a[$k1]['updated_at'] = date('Y-m-d H:i:s', time());

app/Http/Controllers/Admin/Student/CountController.php

@@ -165,11 +165,11 @@ class CountController extends Controller
                         foreach ($data as $k1 => $v1) {
 
                             foreach ($v1 as $k2 => $v2) {
-                                $a[$k1]['year'] = $v2['年份'];
-                                $a[$k1]['class'] = $v2['科类'];
-                                $a[$k1]['grade'] = $v2['分数'];
-                                $a[$k1]['sum'] = $v2['人数'];
-                                $a[$k1]['total'] = $v2['累计'];
+                                $a[$k1]['year'] = $v2['年份']?$v2['年份']:'';
+                                $a[$k1]['class'] = $v2['科类']?$v2['科类']:'';
+                                $a[$k1]['grade'] = $v2['分数']?$v2['分数']:'';
+                                $a[$k1]['sum'] = $v2['人数']?$v2['人数']:'';
+                                $a[$k1]['total'] = $v2['累计']?$v2['累计']:'';
 
 
                                 $a[$k1]['created_at'] = date('Y-m-d H:i:s', time());

app/Http/Controllers/Api/V1/HomeController.php

@@ -219,6 +219,7 @@ class HomeController extends Controller{
      * @apiParam {int}    [userid]   用户ID(必填)
      * @apiParam {string}    [username]   考生姓名(必填)
      * @apiParam {string}    [cnumber]   考号(必填)
+     * @apiParam {string}    [class]   科类(必填)
      * @apiParam {int}    [grade]   高考成绩(必填)
      * @apiParam {int}    [batch]   批次(必填)
      * @apiParam {int}    [province]   省份(必填)
@@ -277,6 +278,7 @@ class HomeController extends Controller{
         $year = 2015;
         $grade = $request->get('grade');
         $batch = $request->get('batch');
+        $class = $request->get('class');
         $province = $request->get('province');
 
         $maxgrade = StudentCountModel::where('year',$year)->orderBy('grade','desc')->first()->grade;
@@ -287,9 +289,9 @@ class HomeController extends Controller{
         }
 
         if($province == "全部省份"){
-            $college = MajorInfoModel::where('year',$year)->where('batch',$batch)->where('min_grade',"<=",$grade)->groupBy('college')->get();
+            $college = MajorInfoModel::where('year',$year)->where('batch',$batch)->where('class',$class)->where('min_grade',"<=",$grade)->groupBy('college')->get();
         }else{
-            $college = MajorInfoModel::where('year',$year)->where('batch',$batch)->where('province','like','%'.$province.'%')->where('min_grade',"<=",$grade)->groupBy('college')->get();
+            $college = MajorInfoModel::where('year',$year)->where('batch',$batch)->where('class',$class)->where('province','like','%'.$province.'%')->where('min_grade',"<=",$grade)->groupBy('college')->get();
         }
 
         $college_count = count($college);
@@ -308,9 +310,6 @@ class HomeController extends Controller{
 
     }
 
-    /***
-     * 更新用户信息
-     */
     public function updateUserinfo(){
         $userid = request('userid');
 
@@ -323,10 +322,6 @@ class HomeController extends Controller{
 
     }
 
-    /***
-     * 创建查询记录
-     * @param $userinfo
-     */
     public function createQueryInfo($userinfo){
         $data['is_paid'] = 0;
         $data['cnumber'] = $userinfo->cnumber;