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-25 16:09:27 +08:00
parent 2bfb2d5264
commit 7a0891ba12
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
continue; continue;
} }
if("8691".equals(recommendMajorDTO.getSchoolCode())){ if("5000".equals(recommendMajorDTO.getSchoolCode())){
System.out.println("qvq"); System.out.println("qvq");
} }

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

@ -109,7 +109,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
// TODO // TODO
key2 = h.getYear()+"-"+ h.getCategory() + "-"; key2 = h.getYear()+"-"+ h.getCategory() + "-";
if("提前批".equals(h.getBatch()) || "本科A段".equals(h.getBatch()) || "本科B段".equals(h.getBatch())){ if("提前批".equals(h.getBatch()) || "本科A段".equals(h.getBatch()) || "本科B段".equals(h.getBatch()) || "本科".equals(h.getBatch())){
key2 = key2 +"本科-"; key2 = key2 +"本科-";
}else{ }else{
key2 = key2 + "高职高专-"; key2 = key2 + "高职高专-";
@ -126,6 +126,11 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
key = key + "_" + h.getMainSubjects(); key = key + "_" + h.getMainSubjects();
key2 = key2 + h.getMainSubjects(); key2 = key2 + h.getMainSubjects();
} }
}else{
key = h.getMajorType();
}
if ("5000".equals(h.getSchoolCode())) {
System.out.println("qvq");
} }
if ("2024".equals(h.getYear()) && batchControlLineMaps.containsKey(key2)) { if ("2024".equals(h.getYear()) && batchControlLineMaps.containsKey(key2)) {
// 2024年的重新计算省控线 计算分数 // 2024年的重新计算省控线 计算分数
@ -152,6 +157,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) { if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {
key+="_" + recommendMajorDTO.getMainSubjects(); key+="_" + recommendMajorDTO.getMainSubjects();
} }
}else{
key = recommendMajorDTO.getMajorType();
} }
key = key + "_" + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch(); key = key + "_" + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
yxHistoryMajorEnroll = majorEnrollMap.get(key); yxHistoryMajorEnroll = majorEnrollMap.get(key);