updates
This commit is contained in:
parent
0d5569d24b
commit
4fc2127be3
|
|
@ -84,7 +84,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
|
|||
String key = majorCode+schoolCode+enrollmentCode+category;
|
||||
//判断这个批次段的是否已填满
|
||||
long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
|
||||
AssertUtils.notTrue(count>=35,"高职高专仅可以填报三十五个志愿");
|
||||
AssertUtils.notTrue(count>64,"高职高专仅可以填报六十四个志愿");
|
||||
}else if(YxConstant.batchList1.contains(batch)){
|
||||
//本科批
|
||||
yxVolunteerRecordLambdaQueryWrapper.in(YxVolunteerRecord::getBatch,YxConstant.batchList1);
|
||||
|
|
@ -93,7 +93,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
|
|||
String key = majorCode+schoolCode+enrollmentCode+category;
|
||||
//判断这个批次段的是否已填满
|
||||
long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
|
||||
AssertUtils.notTrue(count>=35,"本科批仅可以填报三十五个志愿");
|
||||
AssertUtils.notTrue(count>64,"本科批仅可以填报六十四个志愿");
|
||||
}
|
||||
|
||||
//循环已填报专业,与当前专业对比是否一致
|
||||
|
|
|
|||
Loading…
Reference in New Issue