yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-03-10 18:33:19 +08:00
parent cf9ca0f265
commit e7ba0bc3be
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
View File

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