From 7a267151ffd5b1eac6e53fa7222df457c619ecb4 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 13 Jun 2025 18:08:55 +0800
Subject: [PATCH] updates

---
 .../controller/MiniUserScoreController.java   |  5 +++--
 .../YxHistoryMajorEnrollController.java       | 22 +++++++++++++------
 .../modules/yx/service/impl/MusicService.java |  2 +-
 .../impl/YxHistoryMajorEnrollServiceImpl.java |  4 ++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java
index aa1dc5e..7c6d3d5 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java
@@ -69,8 +69,9 @@ public class MiniUserScoreController {
 
         AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750");
         AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0");
-
-        if ("音乐类".equals(professionalCategory)) {
+        if("体育类".equals(professionalCategory)){
+            AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal150) > 0, "[体育成绩]最高分为150");
+        }else if ("音乐类".equals(professionalCategory)) {
             AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300");
             AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0");
         } else if (!"表演类".equals(professionalCategory)) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
index 4a422ac..2affd1e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
@@ -274,22 +274,30 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
     public Result<?> insertNewMajorList() {
         LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
         helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
-//        helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类");
+        helqw.eq(YxHistoryMajorEnroll::getMajorType,"美术与设计类");
         List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
         LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
-        smlqw.eq(YxSchoolMajor::getMajorType,"表演类");
+        smlqw.eq(YxSchoolMajor::getMajorType,"美术与设计类");
         List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
         Map<String ,YxSchoolMajor> map = new HashMap<>();
         String key = "";
         String key2 = "";
         for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) {
-            key = yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getMajorName() + "_" + yxSchoolMajor.getBatch() + "_" + yxSchoolMajor.getCategory();
+            key = "";
+            if ("音乐类".equals(yxSchoolMajor.getMajorType()) || "舞蹈类".equals(yxSchoolMajor.getMajorType())) {
+                key = yxSchoolMajor.getMajorTypeChild()  + "_" + yxSchoolMajor.getMainSubjects();
+            }
+            key = key +"_"+ yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getMajorName() + "_" + yxSchoolMajor.getBatch() + "_" + yxSchoolMajor.getCategory();
             map.put(key,yxSchoolMajor);
         }
         YxSchoolMajor yxSchoolMajor = null;
         List<YxSchoolMajor> saveOrUpdateList = new ArrayList<>();
         for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
-            key2 = yxHistoryMajorEnroll.getSchoolCode()+"_"+ yxHistoryMajorEnroll.getMajorName() + "_" + yxHistoryMajorEnroll.getBatch() + "_" + yxHistoryMajorEnroll.getCategory();
+            key2 = "";
+            if ("音乐类".equals(yxSchoolMajor.getMajorType()) || "舞蹈类".equals(yxSchoolMajor.getMajorType())) {
+                key2 = yxSchoolMajor.getMajorTypeChild()  + "_" + yxSchoolMajor.getMainSubjects();
+            }
+            key2 = key2 +"_"+ yxHistoryMajorEnroll.getSchoolCode()+"_"+ yxHistoryMajorEnroll.getMajorName() + "_" + yxHistoryMajorEnroll.getBatch() + "_" + yxHistoryMajorEnroll.getCategory();
             yxSchoolMajor = map.get(key2);
             if (yxSchoolMajor == null){
                 yxSchoolMajor = new YxSchoolMajor();
@@ -736,9 +744,9 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                 if (CollectionUtils.isNotEmpty(updateList)) {
                     yxHistoryMajorEnrollService.saveOrUpdateBatch(updateList);
                 }
-                if(CollectionUtils.isNotEmpty(schoolMajorList)){
-                    yxSchoolMajorService.saveOrUpdateBatch(schoolMajorList);
-                }
+//                if(CollectionUtils.isNotEmpty(schoolMajorList)){
+//                    yxSchoolMajorService.saveOrUpdateBatch(schoolMajorList);
+//                }
                 log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                 return Result.ok("文件导入成功！数据行数：" + list.size());
             } catch (Exception e) {
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 3e729f2..307fc77 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
@@ -375,7 +375,7 @@ public class MusicService {
                     historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList();
                     rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability();
                     probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
-                    if ("7604".equals(recommendMajorDTO.getSchoolCode()) && "音乐表演".equals(recommendMajorDTO.getMajorName())) {
+                    if ("6316".equals(recommendMajorDTO.getSchoolCode()) && "表演艺术".equals(recommendMajorDTO.getMajorName())) {
                         System.out.println("111");
                     }
                     if(index == 217){
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 d1b3a37..ba15661 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
@@ -113,8 +113,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                     }else if ("音乐类".equals(recommendMajorDTO.getCategory())) {
                         key = recommendMajorDTO.getMajorTypeChild() + "_" + recommendMajorDTO.getMainSubjects();
                     }
-                    key = key + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
-                    yxHistoryMajorEnroll = majorEnrollMap.get(year + a_ + 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) {