updates
This commit is contained in:
parent
dd33eb419a
commit
ad87873dc3
|
|
@ -609,17 +609,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
|
||||||
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
|
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if("6358".equals(recommendMajorDTO.getSchoolCode()) && "产品艺术设计(日用瓷)".equals(recommendMajorDTO.getMajorName()) && "高职高专".equals(recommendMajorDTO.getBatch())){
|
if("7730".equals(recommendMajorDTO.getSchoolCode()) && "冰雪运动与管理(雪上运动与管理方向)".equals(recommendMajorDTO.getMajorName()) && "高职高专".equals(recommendMajorDTO.getBatch())){
|
||||||
System.out.println("qvq");
|
System.out.println("qvq");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 体育类不判断分数过线
|
//判断录取方式,分数是否过省控线
|
||||||
if (!professionalCategory.equals("体育类")) {
|
if (!ScoreUtil.crossingControlLine(rulesEnrollProbability, culturalScore, professionalScore, culturalControlLine, specialControlLine)) {
|
||||||
//判断录取方式,分数是否过省控线
|
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
|
||||||
if (!ScoreUtil.crossingControlLine(rulesEnrollProbability, culturalScore, professionalScore, culturalControlLine, specialControlLine)) {
|
continue;
|
||||||
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if("体育类".equals(professionalCategory) && "4615".equals(recommendMajorDTO.getSchoolCode())
|
if("体育类".equals(professionalCategory) && "4615".equals(recommendMajorDTO.getSchoolCode())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue