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-18 13:19:00 +08:00
parent 3fe1c2e8b2
commit 517c38bc6f
1 changed files with 3 additions and 3 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/service/impl/MusicService.java
View File

@ -134,7 +134,7 @@ public class MusicService {
continue;
}
if (recommendMajorDTO.getSchoolCode().equals("6060")) {
if (recommendMajorDTO.getSchoolCode().equals("6030") && recommendMajorDTO.getBatch().equals("本科A段") && recommendMajorDTO.getEnrollmentCode().contains("12")) {
System.out.println("111");
}
@ -219,10 +219,10 @@ public class MusicService {
differenceMap = ScoreUtil.computeHistoryMajorEnrollScoreLineDifferenceWithRulesEnrollProbability(rulesEnrollProbability, historyMajorEnrollList);
historyThreeYearDiff = (BigDecimal) differenceMap.get("scoreDifference");
nowYearDiff = studentScore.subtract(nowYearProvincialControlLine);
if (historyThreeYearDiff.compareTo(YxConstant.bigDecimal0)==0) {
if (historyThreeYearDiff.compareTo(YxConstant.bigDecimal0)<=0) {
enrollProbability = nowYearDiff.multiply(YxConstant.bigDecimal100);
}else{
if (historyThreeYearDiff == null || historyThreeYearDiff.doubleValue() == 0) {
if (historyThreeYearDiff == null) {
continue;
}
enrollProbability = nowYearDiff.divide(historyThreeYearDiff, 4, RoundingMode.HALF_UP).multiply(YxConstant.bigDecimal100);