From 517c38bc6f53cb0e2c72f3a1b2a541c6c46cc637 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 18 Mar 2024 13:19:00 +0800
Subject: [PATCH] updates

---
 .../org/jeecg/modules/yx/service/impl/MusicService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java
index 859bd9e..59653c6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java
@@ -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);