From dd33eb419ad58bc14f283f6b511fcedb504c5dea Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 26 Jun 2025 22:42:42 +0800
Subject: [PATCH] updates

---
 .../jeecg/modules/yx/service/impl/BiaoyanService.java    | 6 +++---
 .../org/jeecg/modules/yx/service/impl/MusicService.java  | 6 +++---
 .../yx/service/impl/YxCalculationMajorServiceImpl.java   | 9 ++++-----
 .../yx/service/impl/YxHistoryMajorEnrollServiceImpl.java | 2 +-
 .../main/java/org/jeecg/modules/yx/util/ScoreUtil.java   | 4 +---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java
index 57aea3e..3efa96b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java
@@ -402,9 +402,9 @@ public class BiaoyanService {
                     nowYearDiff = studentScore.subtract(nowYearProvincialControlLine);
                     //艺术类，高职高专 算 当前年线差率 (当前年线差/当前年省控线)
                     // "高职高专".equals(recommendMajorDTO.getBatch())
-                    if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
-                        nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
-                    }
+//                    if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
+//                        nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
+//                    }
                     enrollProbability = ScoreUtil.commonCheckEnrollProbability(nowYearDiff,historyThreeYearDiff);
 
                     enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability);
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 179218c..52f767f 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
@@ -469,9 +469,9 @@ public class MusicService {
                     nowYearDiff = studentScore.subtract(nowYearProvincialControlLine);
                     //艺术类，高职高专 算 当前年线差率 (当前年线差/当前年省控线)
                     // "高职高专".equals(recommendMajorDTO.getBatch())
-                    if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
-                        nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
-                    }
+//                    if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
+//                        nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
+//                    }
                     enrollProbability = ScoreUtil.commonCheckEnrollProbability(nowYearDiff,historyThreeYearDiff);
 
                     enrollProbability = ScoreUtil.commonCheckEnrollProbabilityBeilv(enrollProbability);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
index da37ca1..5738091 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
@@ -609,7 +609,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
                         continue;
                     }
-                    if("9879".equals(recommendMajorDTO.getSchoolCode()) && "高职高专".equals(recommendMajorDTO.getBatch())){
+                    if("6358".equals(recommendMajorDTO.getSchoolCode()) && "产品艺术设计（日用瓷）".equals(recommendMajorDTO.getMajorName()) && "高职高专".equals(recommendMajorDTO.getBatch())){
                         System.out.println("qvq");
                     }
 
@@ -704,10 +704,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         //当前年线差
                         nowYearDiff = studentScore.subtract(nowYearProvincialControlLine);
                         //艺术类，高职高专 算 当前年线差率 (当前年线差/当前年省控线)
-                        // "高职高专".equals(recommendMajorDTO.getBatch())
-                        if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
-                            nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
-                        }
+//                        if ("高职高专".equals(recommendMajorDTO.getBatch()) && !"体育类".equals(recommendMajorDTO.getMajorType())) {
+//                            nowYearDiff = nowYearDiff.divide(nowYearProvincialControlLine,6,RoundingMode.HALF_UP);
+//                        }
                         enrollProbability = ScoreUtil.commonCheckEnrollProbability(nowYearDiff,historyThreeYearDiff);
                     }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
index 3898127..392ec6c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
@@ -129,7 +129,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                 }else{
                     key = h.getMajorType();
                 }
-                if ("5000".equals(h.getSchoolCode())) {
+                if ("6358".equals(h.getSchoolCode())) {
                     System.out.println("qvq");
                 }
                 if ("2024".equals(h.getYear()) && batchControlLineMaps.containsKey(key2)) {
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 fc2575e..a855b08 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
@@ -107,9 +107,7 @@ public class ScoreUtil {
             // 5. 特殊逻辑：高职高专（非体育类）需计算分差率（分差/省控线）
             boolean isVocationalCollege = "高职高专".equals(enrollData.getBatch());
             boolean isSportsMajor = "体育类".equals(enrollData.getMajorType());
-            if (isVocationalCollege && !isSportsMajor) {
-                currentDiff = currentDiff.divide(controlLine, 6, RoundingMode.HALF_UP);
-            }else if(isSportsMajor && rulesEnrollProbability.equals(enrollData.getRulesEnrollProbability())){
+            if(isSportsMajor && rulesEnrollProbability.equals(enrollData.getRulesEnrollProbability())){
                 sum = sum.add(currentDiff);
                 validYearCount++;
                 continue;