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

updates 显示24省控线

This commit is contained in:
zhouwentao 2024-06-28 07:43:43 +08:00
parent 589c362390
commit d68d6fa8d5
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,6 +114,28 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
// historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
// }
// }
if ("体育类".equals(professionalCategory)) {
queryWrapper.clear();
queryWrapper.eq(YxHistoryScoreControlLine::getBatch,batch);
queryWrapper.eq(YxHistoryScoreControlLine::getYear,year);
queryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory,professionalCategory);
queryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')");
List<YxHistoryScoreControlLine> list1 = yxHistoryScoreControlLineService.list(queryWrapper);
for (YxHistoryScoreControlLine scoreControlLine : list1) {
if ("文科".equals(scoreControlLine.getCategory())) {
historyScoreControlLine.setCulturalScore(scoreControlLine.getCulturalScore());
}else{
historyScoreControlLine.setCulturalScoreXk(scoreControlLine.getCulturalScore());
}
if ("文科".equals(scoreControlLine.getCategory())) {
historyScoreControlLine.setSpecialScore(scoreControlLine.getSpecialScore());
}else{
historyScoreControlLine.setSpecialScoreXk(scoreControlLine.getSpecialScore());
}
}
}
if ("2024".equals(year)) {
if (batch.equals("本科B段")) {