From f3e130d4cb8fb38d115b0f46c11432005daf4d75 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Sat, 13 Apr 2024 10:16:05 +0800
Subject: [PATCH] update

---
 .../art/controller/ArtRecommendMajorController.java | 13 +++++++------
 .../service/impl/YxCalculationMajorServiceImpl.java |  5 +----
 .../java/org/jeecg/modules/yx/util/ScoreUtil.java   |  8 +++++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java
index 0dd76a7..0f5ea9d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java
@@ -21,11 +21,9 @@ import org.jeecg.modules.art.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.mini.service.MiniTestCulturalService;
 import org.jeecg.modules.yx.constant.YxConstant;
 import org.jeecg.modules.yx.entity.*;
-import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService;
-import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService;
-import org.jeecg.modules.yx.service.IYxSchoolMajorService;
-import org.jeecg.modules.yx.service.IYxUserScoreService;
+import org.jeecg.modules.yx.service.*;
 import org.jeecg.modules.yx.util.ScoreUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -48,6 +46,8 @@ public class ArtRecommendMajorController {
     @Resource
     IYxSchoolMajorService yxSchoolMajorService;
     @Resource
+    IYxCalculationMajorService yxCalculationMajorService;
+    @Resource
     MiniTestCulturalService testCulturalService;
     @Resource
     private RedisUtil redisUtil;
@@ -78,8 +78,9 @@ public class ArtRecommendMajorController {
     @ApiOperation(value = "推荐专业列表")
     @GetMapping("/page")
     public Result<?> recommendMajorPage(QueryRecommendMajorVO queryRecommendMajorVO) {
-        ArtRecommendMajorBaseDTO artRecommendMajorBaseDTO = yxSchoolMajorService.recommendMajorPage(queryRecommendMajorVO);
-        return Result.OK(artRecommendMajorBaseDTO);
+        return Result.OK(yxCalculationMajorService.recommendMajorPage(queryRecommendMajorVO));
+        /*ArtRecommendMajorBaseDTO artRecommendMajorBaseDTO = yxSchoolMajorService.recommendMajorPage(queryRecommendMajorVO);
+        return Result.OK(artRecommendMajorBaseDTO);*/
     }
 
     @ApiOperation(value = "学院专业列表")
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 b1a2c62..e673689 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
@@ -486,14 +486,11 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         continue;
                     }
                     //没有往年录取分数线信息
-                    if (CollectionUtils.isEmpty(historyMajorEnrollList) || ! (ScoreUtil.hasComputeEnrollProbabilityPermissions(nowBatch, recommendMajorDTO.getBatch()))) {
+                    if (CollectionUtils.isEmpty(historyMajorEnrollList) || !(ScoreUtil.hasComputeEnrollProbabilityPermissions(nowBatch, recommendMajorDTO.getBatch()))) {
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
                         continue;
                     }
 
-                    if(recommendMajorDTO.getRulesEnrollProbability().equals("文过专排") && recommendMajorDTO.getSchoolCode().equals("4100")){
-                        System.out.println("11");
-                    }
                     //不是体育类的专业，如果是文过专排，并且没有录取计算运算符时，文过专排是文*0+专*1,专过文排是文*1+专*0
                     if ("文过专排".equals(rulesEnrollProbability) && StringUtils.isBlank(probabilityOperator)) {
                         probabilityOperator = "文*0+专*1";
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 1863047..9416eb7 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
@@ -122,13 +122,14 @@ public class ScoreUtil {
      * @param majorBatch 专业批次
      */
     public static boolean hasComputeEnrollProbabilityPermissions(String nowBatch,String majorBatch){
-        if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) {
+        return true;
+        /*if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) {
             return false;
         }
         //将两个批次设置为数字等级，数字越小 权限越多 1st.
         int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 2 : "本科".equals(nowBatch) ? 3 : 4;
         int majorLevel = "提前批".equals(majorBatch)?1: "本科A段".equals(majorBatch) ? 1 : "本科B段".equals(majorBatch) ? 2 : "本科".equals(majorBatch) ? 3 : 4;
-        return nowLevel<=majorLevel;
+        return nowLevel<=majorLevel;*/
     }
 
     /**
@@ -446,7 +447,8 @@ public class ScoreUtil {
         }else if(YxConstant.culturalControlLineGuo2.equals(rulesEnrollProbability)){
             return culturalScore.compareTo(specialControlLine)>=0;
         }
-        return culturalScore.compareTo(culturalControlLine)>=0 && professionalScore.compareTo(specialControlLine)>=0;
+        //return culturalScore.compareTo(culturalControlLine)>=0 && professionalScore.compareTo(specialControlLine)>=0;
+        return true;
     }
 
     /**