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 56f3a04..9198d72 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 @@ -216,10 +216,10 @@ public class YxHistoryMajorEnrollController extends JeecgController insertNewMajorList() { LambdaQueryWrapper helqw = new LambdaQueryWrapper<>(); helqw.eq(YxHistoryMajorEnroll::getYear,"2024"); - helqw.eq(YxHistoryMajorEnroll::getMajorType,"播音与主持类"); + helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类"); List list = yxHistoryMajorEnrollService.list(helqw); LambdaQueryWrapper smlqw = new LambdaQueryWrapper<>(); - smlqw.eq(YxSchoolMajor::getMajorType,"播音与主持类"); + smlqw.eq(YxSchoolMajor::getMajorType,"表演类"); List yxSchoolMajorList = yxSchoolMajorService.list(smlqw); Map map = new HashMap<>(); String key = ""; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java index 4969706..57aea3e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java @@ -321,6 +321,10 @@ public class BiaoyanService { key = recommendMajorDTO.getCategory(); + if (recommendMajorDTO.getSchoolCode().equals("9088") && "戏剧影视表演".equals(recommendMajorDTO.getMajorName())) { + System.out.println("qvqq"); + } + if("高职高专".equals(recommendMajorDTO.getBatch())){ key = key + "-" + recommendMajorDTO.getBatch(); }else{ 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 5514071..3e729f2 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 @@ -352,11 +352,11 @@ public class MusicService { LambdaQueryWrapper yhsclWrapper = new LambdaQueryWrapper<>(); yhsclWrapper.eq(YxHistoryScoreControlLine::getCategory,activeCurrentUserScore.getCognitioPolyclinic()); yhsclWrapper.in(YxHistoryScoreControlLine::getBatch,"本科","高职高专"); - yhsclWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory,"音乐类-"); + yhsclWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory,"音乐类"); List yhsclList = yxHistoryScoreControlLineService.list(yhsclWrapper); String key = null; for (YxHistoryScoreControlLine yhscl : yhsclList) { - key = yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory(); + key = yhscl.getYear()+"_" +yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory(); batchControlLineMaps.put(key,yhscl); } // Map historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(Integer.parseInt(YxConstant.nowYear), professionalCategory, activeCurrentUserScore.getCognitioPolyclinic()); @@ -375,11 +375,14 @@ public class MusicService { historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList(); rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability(); probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator(); - if ("1103".equals(recommendMajorDTO.getSchoolCode())) { + if ("7604".equals(recommendMajorDTO.getSchoolCode()) && "音乐表演".equals(recommendMajorDTO.getMajorName())) { System.out.println("111"); } + if(index == 217){ + System.out.println("qvq"); + } - key = recommendMajorDTO.getCategory(); + key = YxConstant.nowYear + "_" + recommendMajorDTO.getCategory(); if("高职高专".equals(recommendMajorDTO.getBatch())){ key = key + "-" + recommendMajorDTO.getBatch(); @@ -399,7 +402,7 @@ public class MusicService { }else{ professionalScore = activeCurrentUserScore.getYyjy(); } - batchControlLineMaps.get(recommendMajorDTO.getBatch()); + // batchControlLineMaps.get(recommendMajorDTO.getBatch()); } culturalControlLine = batchControlLineMaps.get(key).getCulturalScore(); specialControlLine = batchControlLineMaps.get(key).getSpecialScore();