From d68d6fa8d5e5acf227aaecb9df93be01d08c287a Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 28 Jun 2024 07:43:43 +0800
Subject: [PATCH] =?UTF-8?q?updates=20=E6=98=BE=E7=A4=BA24=E7=9C=81?=
 =?UTF-8?q?=E6=8E=A7=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YxHistoryScoreControlLineController.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

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<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段")) {