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 11:55:40 +08:00
parent 1045bdb214
commit 4ab51fe8b2
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,12 +375,6 @@ public class MusicService {
historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList();
rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability();
probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
if ("6782".equals(recommendMajorDTO.getSchoolCode()) && "流行音乐（声乐）".equals(recommendMajorDTO.getMajorName())) {
System.out.println("111");
}
if(index == 217){
System.out.println("qvq");
}
key = YxConstant.nowYear + "_" + recommendMajorDTO.getCategory();

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

@ -152,7 +152,22 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
queryRecommendMajorVO.getPCategoryChildrenList().add("兼报");
}
}
Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(YxConstant.nowYear, activeCurrentUserScore.getProfessionalCategory(), activeCurrentUserScore.getCognitioPolyclinic());
Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = null;
if ("音乐类".equals(activeCurrentUserScore.getProfessionalCategory())||
"表演类".equals(activeCurrentUserScore.getProfessionalCategory())) {
historyScoreControlLineMap = new LinkedHashMap<>();
LambdaQueryWrapper<YxHistoryScoreControlLine> yhsclWrapper = new LambdaQueryWrapper<>();
yhsclWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory, activeCurrentUserScore.getProfessionalCategory());
List<YxHistoryScoreControlLine> yhsclList = yxHistoryScoreControlLineService.list(yhsclWrapper);
String key = null;
for (YxHistoryScoreControlLine yhscl : yhsclList) {
key = yhscl.getYear()+"_" +yhscl.getCategory()+"-"+ yhscl.getBatch()+"-"+yhscl.getProfessionalCategory();
historyScoreControlLineMap.put(key,yhscl);
}
}else{
historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(YxConstant.nowYear, activeCurrentUserScore.getProfessionalCategory(), activeCurrentUserScore.getCognitioPolyclinic());
}
//标签类别
if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {
@ -210,8 +225,27 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
YxHistoryScoreControlLine yxHistoryScoreControlLine = null;
BigDecimal bigDecimal = null;
String key = null;
for (RecommendMajorDTO recommendMajorDTO : recommendMajorDTOList) {
yxHistoryScoreControlLine = historyScoreControlLineMap.get(recommendMajorDTO.getBatch());
key = YxConstant.nowYear + "_" + recommendMajorDTO.getCategory();
if("高职高专".equals(recommendMajorDTO.getBatch())){
key = key + "-" + recommendMajorDTO.getBatch();
}else{
key = key + "-本科";
}
// 判断是 音乐教育还是音乐表演 器乐/声乐
if ("音乐类".equals(recommendMajorDTO.getMajorType())) {
key = key +"-音乐类-"+ recommendMajorDTO.getMajorTypeChild();
if ("音乐表演".equals(recommendMajorDTO.getMajorTypeChild())) {
key += recommendMajorDTO.getMainSubjects();
}
}else if ("表演类".equals(recommendMajorDTO.getMajorType())) {
key = key +"-表演类-"+ recommendMajorDTO.getMajorTypeChild();
}else{
key = activeCurrentUserScore.getBatch();
}
yxHistoryScoreControlLine = historyScoreControlLineMap.get(key);
if (yxHistoryScoreControlLine!=null) {
if (recommendMajorDTO.getStudentScore()!=null) {
bigDecimal = ScoreUtil.covertIntoControlLine(recommendMajorDTO.getRulesEnrollProbability(),