From 3c243ad5a6e42974ccbf2246a6109097e2907d37 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 8 May 2025 21:40:44 +0800
Subject: [PATCH] updates

---
 .../impl/YxCalculationMajorServiceImpl.java   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 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 c55dd45..0810790 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
@@ -266,19 +266,18 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
      * @param recommendMajorList
      */
     private static void convertRecommendMajorListToNull(List<RecommendMajorDTO> recommendMajorList) {
-        List<String> rulesEnrollProbabilityList = Arrays.asList("文*0.8+文*0.5", "文*0.7+文*0.75","文*0.6+专*1","文*0.5+专*1.25");
-        List<String> rulesEnrollProbabilitySxList = Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
-        recommendMajorList.forEach(r->{
-//            r.setPlanNum(null);
-            //非体育，非专科
-            if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专")){
-                if (rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) {
-                }else if(!rulesEnrollProbabilityList.contains(r.getRulesEnrollProbability())){
-                    r.setRulesEnrollProbability(null);
-                }
-            }
-
-        });
+//        List<String> rulesEnrollProbabilityList = Arrays.asList("文*0.8+文*0.5", "文*0.7+文*0.75","文*0.6+专*1","文*0.5+专*1.25");
+//        List<String> rulesEnrollProbabilitySxList = Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
+//        recommendMajorList.forEach(r->{
+////            r.setPlanNum(null);
+//            //非体育，非专科
+//            if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专")){
+//                if (rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) {
+//                }else if(!rulesEnrollProbabilityList.contains(r.getRulesEnrollProbability())){
+//                    r.setRulesEnrollProbability(null);
+//                }
+//            }
+//        });
     }
 
     @Override