From 589c362390889a6d9002773bcb1fe3aecd822ce5 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 28 Jun 2024 07:25:22 +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

---
 .../MiniRecommendMajorController.java         |  3 ++
 .../YxHistoryScoreControlLineController.java  | 51 ++++++++++++-------
 .../service/impl/YxVolunteerServiceImpl.java  |  3 --
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java
index edede22..6f3e8e5 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java
@@ -147,6 +147,9 @@ public class MiniRecommendMajorController {
                 }
                 //根据录取方式，计算折合分数
                 for (String rulesEnrollProbability : maps.keySet()) {
+                    if (StringUtils.isBlank(rulesEnrollProbability)) {
+                        continue;
+                    }
                     Optional<YxSchoolMajor> any = schooMajorList.stream().filter(s -> s.getRulesEnrollProbability().equals(rulesEnrollProbability)).findAny();
                     if (any.isPresent()) {
                         YxSchoolMajor yxSchoolMajor = any.get();
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 1dcd2f5..ad55eea 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
@@ -103,26 +103,41 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
 			 for (YxHistoryScoreControlLine historyScoreControlLine : historyScoreControlLineList) {
 				 year = historyScoreControlLine.getYear();
 				 batch = historyScoreControlLine.getBatch();
-				 if (YxConstant.nowYear.equals(year)) {
-					 if (!"高职高专".equals(batch)) {
-						 historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
-						 historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
-						 historyScoreControlLine.setSpecialScore(YxConstant.bigDecimal0);
-						 historyScoreControlLine.setSpecialScoreXk(YxConstant.bigDecimal0);
-					 }else{
-						 historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
-						 historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
+//				 if (YxConstant.nowYear.equals(year)) {
+//					 if (!"高职高专".equals(batch)) {
+//						 historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
+//						 historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
+//						 historyScoreControlLine.setSpecialScore(YxConstant.bigDecimal0);
+//						 historyScoreControlLine.setSpecialScoreXk(YxConstant.bigDecimal0);
+//					 }else{
+//						 historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
+//						 historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
+//					 }
+//				 }
+
+				 if ("2024".equals(year)) {
+					 if (batch.equals("本科B段")) {
+						 continue;
 					 }
+					 if(batch.equals("本科A段")){
+						 historyScoreControlLine.setBatch("本科批");
+					 }
+					 list = dataMaps.getOrDefault(year,new ArrayList<>());
+					 list.add(historyScoreControlLine);
+					 dataMaps.put(year,list);
+				 }else{
+					 list = dataMaps.getOrDefault(year,new ArrayList<>());
+					 if ("本科A段".equals(batch)) {
+						 YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine();
+						 BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1);
+						 yxHistoryScoreControlLine1.setBatch("本科提前批");
+						 list.add(yxHistoryScoreControlLine1);
+					 }
+					 list.add(historyScoreControlLine);
+					 dataMaps.put(year,list);
 				 }
-				 list = dataMaps.getOrDefault(year,new ArrayList<>());
-				 if ("本科A段".equals(batch)) {
-					 YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine();
-					 BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1);
-					 yxHistoryScoreControlLine1.setBatch("本科提前批");
-					 list.add(yxHistoryScoreControlLine1);
-				 }
-				 list.add(historyScoreControlLine);
-				 dataMaps.put(year,list);
+
+
 			 }
 			 json = JSONObject.toJSONString(dataMaps);
 			 redisUtil.set(key,json,3600);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
index 31031fd..34c185c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
@@ -49,9 +49,6 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
     @Resource
     private YxVolunteerRecordMapper yxVolunteerRecordMapper;
 
-    final static BigDecimal bigDecimal100 = new BigDecimal("100");//100倍率
-
-
     @Override
     public VolunteerDTO getActiveByCreate(String createBy) {
         VolunteerDTO volunteerDTO = new VolunteerDTO();