| xqd
@@ -340,7 +340,6 @@ class HomeController extends Controller
|
|
|
[
|
|
|
'cnumber.required' => '考号不能为空!',
|
|
|
'username.required' => '姓名不能为空!',
|
|
|
- 'username.required' => '姓名不能为空!',
|
|
|
'mobile.required' => '手机号不能为空!',
|
|
|
'grade.required' => '成绩不能为空!',
|
|
|
'grade.integer' => '请输入正确格式的成绩!',
|
| xqd
@@ -361,13 +360,18 @@ class HomeController extends Controller
|
|
|
$class = $request->get('class');
|
|
|
$province = $request->get('province');
|
|
|
|
|
|
- $maxgrade = StudentCountModel::where('year', $year)->orderBy('grade', 'desc')->first()->grade;
|
|
|
- if ($grade > $maxgrade) {
|
|
|
- $rank = "前10";
|
|
|
- } else {
|
|
|
- $rank = StudentCountModel::where('year', $year)->where('grade', $grade)->first(['total'])->total;
|
|
|
+ if(StudentCountModel::where('year', $year)->where('class',$class)->count() > 0){
|
|
|
+ $maxgrade = StudentCountModel::where('year', $year)->where('class',$class)->orderBy('grade', 'desc')->first()->grade;
|
|
|
+ if ($grade > $maxgrade) {
|
|
|
+ $rank = "前10";
|
|
|
+ } else {
|
|
|
+ $rank = StudentCountModel::where('year', $year)->where('class',$class)->where('grade', $grade)->first(['total'])->total;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ $rank = '未知';
|
|
|
}
|
|
|
|
|
|
+
|
|
|
if ($province == "全部省份") {
|
|
|
$college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('min_grade', "<=", $grade)->groupBy('college')->get();
|
|
|
} else {
|