diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java index 2828d21..f3d0ca9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java @@ -75,6 +75,10 @@ public class ScoreUtil { BigDecimal controlLine = null;//文科-省控线 BigDecimal admissionLine = null;//文科-录取线 for (YxHistoryMajorEnroll yxHistoryMajorEnroll : historyMajorEnrollList) { + if (yearNum>=1&& !yxHistoryMajorEnroll.getRulesEnrollProbability().equals(rulesEnrollProbability)) { + //如果仅两年的录取原则一样,后面的不一样,不使用较旧的分数 + continue; + } controlLine = yxHistoryMajorEnroll.getControlLine(); admissionLine = yxHistoryMajorEnroll.getAdmissionLine(); if (admissionLine.compareTo(YxConstant.bigDecimal0) <=0) { @@ -92,9 +96,7 @@ public class ScoreUtil { } sum=sum.add(nowSum);//录取线-省控线 yearNum++; - /*if (yxHistoryMajorEnroll.getRulesEnrollProbability().replace("+","").equals(rulesEnrollProbability.replace("+",""))) { - }*/ } if (yearNum!=0) { BigDecimal divide = sum.divide(new BigDecimal(yearNum), 4, RoundingMode.HALF_UP);