From 0d5569d24b6c56ac8db9bd7543a29c22bbd5b0ba Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 25 Jun 2025 14:26:31 +0800
Subject: [PATCH] updates

---
 .../modules/yx/service/impl/MusicService.java |  3 ++
 .../impl/YxHistoryMajorEnrollServiceImpl.java | 53 ++++++++++++++++---
 2 files changed, 48 insertions(+), 8 deletions(-)

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 32814a9..179218c 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
@@ -416,6 +416,9 @@ public class MusicService {
                         continue;
                     }
 
+                    if("8127".equals(recommendMajorDTO.getSchoolCode())){
+                        System.out.println("qvq");
+                    }
                     //判断其他录取要求
                     if(!ScoreUtil.otherScoreJudge(professionalScore,activeCurrentUserScore,recommendMajorDTO)){
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
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 ddfc103..2f94b95 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
@@ -85,19 +85,53 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
             hmeWrapper.isNotNull(YxHistoryMajorEnroll::getRulesEnrollProbability);
             hmeWrapper.orderByDesc(YxHistoryMajorEnroll::getYear);
             List<YxHistoryMajorEnroll> yxHistoryMajorEnrollList = this.list(hmeWrapper);
+
+            // 获取历年省控线
+            LambdaQueryWrapper<YxHistoryScoreControlLine> yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            yxHistoryMajorEnrollLambdaQueryWrapper.in(YxHistoryScoreControlLine::getYear, YxConstant.oldYearList);
+            yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getCategory, category);
+            yxHistoryMajorEnrollLambdaQueryWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory, majorType);
+            List<YxHistoryScoreControlLine> yhsclList = yxHistoryScoreControlLineService.list(yxHistoryMajorEnrollLambdaQueryWrapper);
+            Map<String, YxHistoryScoreControlLine> batchControlLineMaps = new LinkedHashMap<>();
+            String key = null;
+            String key2 = null;
+            for (YxHistoryScoreControlLine yhscl : yhsclList) {
+                key2 = yhscl.getYear() +"-"+ yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory();
+                batchControlLineMaps.put(key2,yhscl);
+            }
             //获取院校信息
             String a_ = "_";
-            String key = null;
+
             //将历年计划 组合成map对象
             Map<String, YxHistoryMajorEnroll> majorEnrollMap = new LinkedHashMap<>();
             for (YxHistoryMajorEnroll h : yxHistoryMajorEnrollList) {
                 key = "";
+                // TODO
+                key2 = h.getYear()+"-"+ h.getCategory() + "-";
+
+                if("提前批".equals(h.getBatch()) || "本科A段".equals(h.getBatch()) || "本科B段".equals(h.getBatch())){
+                    key2 = key2 +"本科-";
+                }else{
+                    key2 = key2 + "高职高专-";
+                }
+                key2+= h.getMajorType();
+
                 if ("表演类".equals(h.getMajorType())) {
                     key = h.getMajorTypeChild() + "_";
-                }else if ("音乐类".equals(h.getCategory())) {
-                    key = h.getMajorTypeChild() + "_" + h.getMainSubjects();
+                    key = key + "-" + h.getMajorTypeChild();
+                }else if ("音乐类".equals(h.getMajorType())) {
+                    key = h.getMajorTypeChild();
+                    key2 = key2 +"-"+ h.getMajorTypeChild();
+                    if(!"音乐教育".equals(h.getMajorTypeChild())){
+                        key = key + "_" +  h.getMainSubjects();
+                        key2 = key2 + h.getMainSubjects();
+                    }
                 }
-                key += h.getYear() + a_ + h.getSchoolCode() + a_ + h.getMajorName() + a_ + h.getCategory() + a_ + h.getBatch();
+                if ("2024".equals(h.getYear()) && batchControlLineMaps.containsKey(key2)) {
+                    // 2024年的重新计算省控线 计算分数
+                    h.setControlLine(ScoreUtil.convertIntoScore(h.getRulesEnrollProbability(), batchControlLineMaps.get(key2).getCulturalScore(), batchControlLineMaps.get(key2).getSpecialScore(), h.getProbabilityOperator()));
+                }
+                key += a_ + h.getYear() + a_ + h.getSchoolCode() + a_ + h.getMajorName() + a_ + h.getCategory() + a_ + h.getBatch();
                 majorEnrollMap.put(key, h);
             }
             //遍历，获取历年数据 添加到专业 的历年信息中
@@ -113,11 +147,14 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                     key = "";
                     if ("表演类".equals(recommendMajorDTO.getMajorType())) {
                         key = recommendMajorDTO.getMajorTypeChild() + "_";
-                    }else if ("音乐类".equals(recommendMajorDTO.getCategory())) {
-                        key = recommendMajorDTO.getMajorTypeChild() + "_" + recommendMajorDTO.getMainSubjects();
+                    }else if ("音乐类".equals(recommendMajorDTO.getMajorType())) {
+                        key = recommendMajorDTO.getMajorTypeChild();
+                        if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {
+                            key+="_" + recommendMajorDTO.getMainSubjects();
+                        }
                     }
-                    key = key + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
-                    yxHistoryMajorEnroll = majorEnrollMap.get( key);
+                    key = key + "_" + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
+                    yxHistoryMajorEnroll = majorEnrollMap.get(key);
                     if (yxHistoryMajorEnroll != null) {
                         //线差
                         if (yxHistoryMajorEnroll.getAdmissionLine()!=null) {