From 7a0891ba120ceafcf81543aefb60844111c20727 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 25 Jun 2025 16:09:27 +0800
Subject: [PATCH] updates

---
 .../yx/service/impl/YxCalculationMajorServiceImpl.java   | 2 +-
 .../yx/service/impl/YxHistoryMajorEnrollServiceImpl.java | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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 79f99df..5367c17 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
@@ -600,7 +600,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
                         continue;
                     }
-                    if("8691".equals(recommendMajorDTO.getSchoolCode())){
+                    if("5000".equals(recommendMajorDTO.getSchoolCode())){
                         System.out.println("qvq");
                     }
 
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 527900d..3898127 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
@@ -109,7 +109,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                 // TODO
                 key2 = h.getYear()+"-"+ h.getCategory() + "-";
 
-                if("提前批".equals(h.getBatch()) || "本科A段".equals(h.getBatch()) || "本科B段".equals(h.getBatch())){
+                if("提前批".equals(h.getBatch()) || "本科A段".equals(h.getBatch()) || "本科B段".equals(h.getBatch()) || "本科".equals(h.getBatch())){
                     key2 = key2 +"本科-";
                 }else{
                     key2 = key2 + "高职高专-";
@@ -126,6 +126,11 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                         key = key + "_" +  h.getMainSubjects();
                         key2 = key2 + h.getMainSubjects();
                     }
+                }else{
+                    key = h.getMajorType();
+                }
+                if ("5000".equals(h.getSchoolCode())) {
+                    System.out.println("qvq");
                 }
                 if ("2024".equals(h.getYear()) && batchControlLineMaps.containsKey(key2)) {
                     // 2024年的重新计算省控线 计算分数
@@ -152,6 +157,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                         if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {
                             key+="_" + recommendMajorDTO.getMainSubjects();
                         }
+                    }else{
+                        key = recommendMajorDTO.getMajorType();
                     }
                     key = key + "_" + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
                     yxHistoryMajorEnroll = majorEnrollMap.get(key);