diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java index ad55eea..3260629 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java @@ -114,6 +114,28 @@ public class YxHistoryScoreControlLineController extends JeecgController 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段")) {