wesley.chen преди 7 години
родител
ревизия
0e28df22b2
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      app/Http/Controllers/Api/V1/HomeController.php

+ 2 - 2
app/Http/Controllers/Api/V1/HomeController.php

xqd
@@ -373,9 +373,9 @@ class HomeController extends Controller
 
 
         if ($province == "全部省份") {
-            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where("batch_grade", "<=", "$grade - miss_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('class', $class)->where('province', 'like', '%' . $province . '%')->where("batch_grade", "<=", "$grade - miss_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);