From b8075c2d7f5d7d5497031e41d19aa6e22a69d6c3 Mon Sep 17 00:00:00 2001
From: zwt13703 <zwt13703@gmail.com>
Date: Sun, 15 Mar 2026 17:41:37 +0800
Subject: [PATCH] updates

---
 .../service/impl/YxCalculationMajorServiceImpl.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 42e982f..d0718f9 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
@@ -584,7 +584,13 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                     //取出往年的分数信息, 算出 三年平均差值
                     historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList();
                     rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability();
+                    if (StringUtils.isBlank(rulesEnrollProbability)) {
+                        rulesEnrollProbability = recommendMajorDTO.getRulesEnrollProbability();
+                    }
                     probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
+                    if (StringUtils.isBlank(probabilityOperator)) {
+                        probabilityOperator = recommendMajorDTO.getProbabilityOperator();
+                    }
                     culturalControlLine = historyScoreControlLineMap.get(recommendMajorDTO.getBatch()).getCulturalScore();
                     specialControlLine = historyScoreControlLineMap.get(recommendMajorDTO.getBatch()).getSpecialScore();
                     //没有计算方式 跳过
@@ -592,6 +598,10 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         continue;
                     }
 
+                    if ("南通大学".equals(recommendMajorDTO.getSchoolName())) {
+                        System.out.println("找到你了");
+                    }
+
                     //不是体育类的专业，如果是文过专排，并且没有录取计算运算符时，文过专排是文*0+专*1,专过文排是文*1+专*0
                     if ("文过专排".equals(rulesEnrollProbability) && StringUtils.isBlank(probabilityOperator)) {
                         probabilityOperator = "文*0+专*1";
@@ -609,6 +619,8 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         continue;
                     }
 
+
+
                     // 25年专业录取原则变动，概率修改为0
                     if("体育类".equals(recommendMajorDTO.getMajorType()) && Arrays.asList("6530、6085、6110、6065、6050".split("、")).contains(recommendMajorDTO.getSchoolCode())){
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);