major grade

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

@@ -197,6 +197,7 @@ class InfoController extends Controller
                                 $a[$k1]['min_rank'] = isset($v2['最低位次'])?$v2['最低位次']:'';
                                 $a[$k1]['max_rank'] = isset($v2['最高位次'])?$v2['最高位次']:'';
                                 $a[$k1]['avg_rank'] = isset($v2['平均位次'])?$v2['平均位次']:'';
+                                $a[$k1]['major_grade'] = $a[$k1]['batch_grade'] + $a[$k1]['miss_grade'];
 
                                 $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/Api/V1/HomeController.php

@@ -373,9 +373,9 @@ class HomeController extends Controller
 
 
         if ($province == "全部省份") {
-            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where("min_grade", "<=", "$grade")->groupBy('college')->get();
+            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where("major_grade", "<=", "$grade")->groupBy('college')->get();
         } else {
-            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->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("major_grade", "<=", "$grade")->groupBy('college')->get();
         }
 
         $college_count = count($college);
@@ -470,9 +470,9 @@ class HomeController extends Controller
 
 
             if ($province == "全部省份") {
-                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('min_grade', "<=", "$grade")->paginate(10);
+                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('major_grade', "<=", "$grade")->paginate(10);
             } else {
-                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('min_grade', "<=", "$grade")->paginate(10);
+                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('major_grade', "<=", "$grade")->paginate(10);
             }
 
             $count = count($major);

app/Models/MajorInfoModel.php

@@ -1,13 +1,15 @@
 <?php
+
 namespace App\Models;
+
 use App\Models\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- *  @description 专业信息
- *  @author  system;
- *  @version    1.0
- *  @date 2018-06-06 01:44:59
+ * @description 专业信息
+ * @author  system;
+ * @version    1.0
+ * @date 2018-06-06 01:44:59
  *
  */
 class MajorInfoModel extends BaseModel
@@ -21,7 +23,7 @@ class MajorInfoModel extends BaseModel
      */
     protected $table = 'major_info';
     /**
-    主键
+     * 主键
      */
     protected $primaryKey = 'id';
 
@@ -34,24 +36,25 @@ class MajorInfoModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'year',
-                           'class',
-                           'batch',
-                           'level',
-                           'type',
-                           'college',
-                           'province',
-                           'city',
-                           'major',
-                           'max_grade',
-                           'min_grade',
-                           'avg_grade',
-                           'batch_grade',
-                           'miss_grade',
-                           'max_rank',
-                           'min_rank',
-                           'avg_rank',
-                           'comment'
-                          ];
+        'year',
+        'class',
+        'batch',
+        'level',
+        'type',
+        'college',
+        'province',
+        'city',
+        'major',
+        'max_grade',
+        'min_grade',
+        'avg_grade',
+        'batch_grade',
+        'miss_grade',
+        'max_rank',
+        'min_rank',
+        'avg_rank',
+        'major_grade',
+        'comment'
+    ];
 
 }

database/migrations/2018_06_13_053015_add_major_grade_to_major_info.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMajorGradeToMajorInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('major_info', function (Blueprint $table) {
+            $table->integer('major_grade')->after('miss_grade')->nullable()->comment('专业录取线');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('major_info', function (Blueprint $table) {
+            //
+        });
+    }
+}