From 4d0e3818805bd6a9baa06aad2472ef6ea9ca6096 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 15 May 2024 21:41:25 +0800
Subject: [PATCH] updates

---
 .../YxHistoryMajorEnrollController.java       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
index 0170979..4355d14 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
@@ -332,6 +332,14 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                     major = majorMap.get(mn);
                     AssertUtils.notNull(major, String.format("行[%s],专业未在系统中找到", index));
                     yxHistoryMajorEnroll.setMajorCode(major.getMajorCode());
+
+                    if (index==11) {
+                        System.out.println("1");
+                    }
+
+                    if ("提前批".equals(batch)) {
+                        batch = "本科提前批";
+                    }
                     //省控线
                     //文科_本科A段_美术与设计_2023
                     if ("舞蹈类".equals(majorType)) {
@@ -343,6 +351,13 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                         } else {
                             throw new JeecgBootException(String.format("行[%s],未识别到舞蹈类型", index));
                         }
+                    } else if(majorType.contains("体育")){
+                        if (batch.contains("专科") || batch.contains("高职高专")) {
+                            batch = "高职高专";
+                        }else{
+                            batch = "本科";
+                        }
+                        key = category + "_" + batch + "_" + majorType + "_" + year;
                     } else {
                         key = category + "_" + batch + "_" + majorType + "_" + year;
                     }
@@ -380,6 +395,18 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                         yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
                     }
 
+
+                    if("体育".contains(yxHistoryMajorEnroll.getMajorType())){
+                        if(batch.contains("专科") || batch.contains("高职高专")){
+                            yxHistoryMajorEnroll.setBatch("高职高专");
+                        }else {
+                            yxHistoryMajorEnroll.setBatch("本科");
+                        }
+                    }else if (batch.contains("提前")) {
+                        yxHistoryMajorEnroll.setBatch("提前批");
+                    }
+
+
                     //查询库中是否有该条数据
                     yxHistoryMajorEnrollLambdaQueryWrapper.clear();
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getYear, year);
@@ -390,6 +417,8 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory, category);
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorType, majorType);
                     oldYxHistoryMajorEnroll = yxHistoryMajorEnrollService.getOne(yxHistoryMajorEnrollLambdaQueryWrapper);
+
+
                     if (oldYxHistoryMajorEnroll == null) {
                         updateList.add(yxHistoryMajorEnroll);
                     } else {