yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2025-06-07 09:06:07 +08:00
parent 0790b6ce9d
commit 4eff859075
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
View File

@ -216,10 +216,10 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
public Result<?> insertNewMajorList() { public Result<?> insertNewMajorList() {
LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
helqw.eq(YxHistoryMajorEnroll::getYear,"2024"); helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
helqw.eq(YxHistoryMajorEnroll::getMajorType,"播音与主持类"); helqw.eq(YxHistoryMajorEnroll::getMajorType,"表演类");
List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw); List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
smlqw.eq(YxSchoolMajor::getMajorType,"播音与主持类"); smlqw.eq(YxSchoolMajor::getMajorType,"表演类");
List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw); List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
Map<String ,YxSchoolMajor> map = new HashMap<>(); Map<String ,YxSchoolMajor> map = new HashMap<>();
String key = ""; String key = "";

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java
View File

@ -321,6 +321,10 @@ public class BiaoyanService {
key = recommendMajorDTO.getCategory(); key = recommendMajorDTO.getCategory();
if (recommendMajorDTO.getSchoolCode().equals("9088") && "戏剧影视表演".equals(recommendMajorDTO.getMajorName())) {
System.out.println("qvqq");
}
if("高职高专".equals(recommendMajorDTO.getBatch())){ if("高职高专".equals(recommendMajorDTO.getBatch())){
key = key + "-" + recommendMajorDTO.getBatch(); key = key + "-" + recommendMajorDTO.getBatch();
}else{ }else{

13
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java
View File

@ -352,11 +352,11 @@ public class MusicService {
LambdaQueryWrapper<YxHistoryScoreControlLine> yhsclWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxHistoryScoreControlLine> yhsclWrapper = new LambdaQueryWrapper<>();
yhsclWrapper.eq(YxHistoryScoreControlLine::getCategory,activeCurrentUserScore.getCognitioPolyclinic()); yhsclWrapper.eq(YxHistoryScoreControlLine::getCategory,activeCurrentUserScore.getCognitioPolyclinic());
yhsclWrapper.in(YxHistoryScoreControlLine::getBatch,"本科","高职高专"); yhsclWrapper.in(YxHistoryScoreControlLine::getBatch,"本科","高职高专");
yhsclWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory,"音乐类-"); yhsclWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory,"音乐类");
List<YxHistoryScoreControlLine> yhsclList = yxHistoryScoreControlLineService.list(yhsclWrapper); List<YxHistoryScoreControlLine> yhsclList = yxHistoryScoreControlLineService.list(yhsclWrapper);
String key = null; String key = null;
for (YxHistoryScoreControlLine yhscl : yhsclList) { for (YxHistoryScoreControlLine yhscl : yhsclList) {
key = yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory(); key = yhscl.getYear()+"_" +yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory();
batchControlLineMaps.put(key,yhscl); batchControlLineMaps.put(key,yhscl);
} }
// Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(Integer.parseInt(YxConstant.nowYear), professionalCategory, activeCurrentUserScore.getCognitioPolyclinic()); // Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(Integer.parseInt(YxConstant.nowYear), professionalCategory, activeCurrentUserScore.getCognitioPolyclinic());
@ -375,11 +375,14 @@ public class MusicService {
historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList(); historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList();
rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability(); rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability();
probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator(); probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
if ("1103".equals(recommendMajorDTO.getSchoolCode())) { if ("7604".equals(recommendMajorDTO.getSchoolCode()) && "音乐表演".equals(recommendMajorDTO.getMajorName())) {
System.out.println("111"); System.out.println("111");
} }
if(index == 217){
System.out.println("qvq");
}
key = recommendMajorDTO.getCategory(); key = YxConstant.nowYear + "_" + recommendMajorDTO.getCategory();
if("高职高专".equals(recommendMajorDTO.getBatch())){ if("高职高专".equals(recommendMajorDTO.getBatch())){
key = key + "-" + recommendMajorDTO.getBatch(); key = key + "-" + recommendMajorDTO.getBatch();
@ -399,7 +402,7 @@ public class MusicService {
}else{ }else{
professionalScore = activeCurrentUserScore.getYyjy(); professionalScore = activeCurrentUserScore.getYyjy();
} }
batchControlLineMaps.get(recommendMajorDTO.getBatch()); // batchControlLineMaps.get(recommendMajorDTO.getBatch());
} }
culturalControlLine = batchControlLineMaps.get(key).getCulturalScore(); culturalControlLine = batchControlLineMaps.get(key).getCulturalScore();
specialControlLine = batchControlLineMaps.get(key).getSpecialScore(); specialControlLine = batchControlLineMaps.get(key).getSpecialScore();