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

fix: updates

This commit is contained in:
zhouwentao 2026-01-12 20:20:18 +08:00
parent 9dd3eb5714
commit 0a6e0f54f4
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,9 +155,10 @@ public class YxScoreController {
//24年分数转换折合23年分数 //24年分数转换折合23年分数
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
if ("舞蹈类".equals(professionalCategory)) { if ("舞蹈类".equals(professionalCategory)) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, userScoreUpdateDTO.getProvince()); // scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, userScoreUpdateDTO.getProvince());
professionalScore = scoreSegment.getScore(); // professionalScore = scoreSegment.getScore();
} else if ("音乐类".equals(professionalCategory)) { }
else if ("音乐类".equals(professionalCategory)) {
if (!professionalCategoryChildren.contains("器乐")) { if (!professionalCategoryChildren.contains("器乐")) {
userScoreUpdateDTO.setYybyqy(YxConstant.bigDecimal0); userScoreUpdateDTO.setYybyqy(YxConstant.bigDecimal0);
} }
@ -167,7 +168,7 @@ public class YxScoreController {
if (!professionalCategoryChildren.contains("音乐教育")) { if (!professionalCategoryChildren.contains("音乐教育")) {
userScoreUpdateDTO.setYyjy(YxConstant.bigDecimal0); userScoreUpdateDTO.setYyjy(YxConstant.bigDecimal0);
} }
BigDecimal yybysy = userScoreUpdateDTO.getYybysy();//音乐表演声乐成绩 /*BigDecimal yybysy = userScoreUpdateDTO.getYybysy();//音乐表演声乐成绩
BigDecimal yybyqy = userScoreUpdateDTO.getYybyqy();//音乐表演器乐成绩 BigDecimal yybyqy = userScoreUpdateDTO.getYybyqy();//音乐表演器乐成绩
BigDecimal yyjy = userScoreUpdateDTO.getYyjy();//音乐教育成绩 BigDecimal yyjy = userScoreUpdateDTO.getYyjy();//音乐教育成绩
@ -188,16 +189,19 @@ public class YxScoreController {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yyjy, professionalCategory, "音乐教育", userScoreUpdateDTO.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yyjy, professionalCategory, "音乐教育", userScoreUpdateDTO.getProvince());
yyjy = scoreSegment.getScore(); yyjy = scoreSegment.getScore();
} }
professionalScore = yybysy.max(yybyqy).max(yyjy); professionalScore = yybysy.max(yybyqy).max(yyjy);*/
} else if ("播音与主持类".equals(professionalCategory)) { }
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, userScoreUpdateDTO.getProvince()); else if ("播音与主持类".equals(professionalCategory)) {
professionalScore = scoreSegment.getScore(); // scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, userScoreUpdateDTO.getProvince());
} else if ("表演类".equals(professionalCategory)) { // professionalScore = scoreSegment.getScore();
}
else if ("表演类".equals(professionalCategory)) {
BigDecimal xjysby = userScoreUpdateDTO.getXjysby();//戏剧影视表演 BigDecimal xjysby = userScoreUpdateDTO.getXjysby();//戏剧影视表演
BigDecimal xjysdy = userScoreUpdateDTO.getXjysdy();//戏剧影视导演 BigDecimal xjysdy = userScoreUpdateDTO.getXjysdy();//戏剧影视导演
BigDecimal fzby = userScoreUpdateDTO.getFzby();//服装表演 BigDecimal fzby = userScoreUpdateDTO.getFzby();//服装表演
oldProfessionalScore = xjysby.max(xjysdy).max(fzby); oldProfessionalScore = xjysby.max(xjysdy).max(fzby);
if (xjysby != null && xjysby.compareTo(YxConstant.bigDecimal0) > 0) { userScoreUpdateDTO.setProfessionalScore(oldProfessionalScore);
/*if (xjysby != null && xjysby.compareTo(YxConstant.bigDecimal0) > 0) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory, "戏剧影视表演", userScoreUpdateDTO.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory, "戏剧影视表演", userScoreUpdateDTO.getProvince());
xjysby = scoreSegment.getScore(); xjysby = scoreSegment.getScore();
} }
@ -210,16 +214,14 @@ public class YxScoreController {
fzby = scoreSegment.getScore(); fzby = scoreSegment.getScore();
} }
professionalScore = xjysby.max(xjysdy).max(fzby); professionalScore = xjysby.max(xjysdy).max(fzby);
userScoreUpdateDTO.setProfessionalScore(oldProfessionalScore); userScoreUpdateDTO.setProfessionalScore(oldProfessionalScore);*/
} }
} }
String batch = "本科A段"; String batch = "本科A段";
if (professionalCategory.contains("体育类")) { if (professionalCategory.contains("体育类")) {
batch = "本科"; batch = "本科";
} }
/*if (professionalScore != null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) {
batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList);
}*/
//================批次 end //================批次 end
//根据批次，判断 本科/高职高专 //根据批次，判断 本科/高职高专
//关闭当前用户之前的分数和志愿单 //关闭当前用户之前的分数和志愿单