From 0790b6ce9dcac3838b8f91025c5c553a5ce8fc78 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 6 Jun 2025 19:44:54 +0800
Subject: [PATCH] updates

---
 .../YxHistoryMajorEnrollController.java           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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 4547ea2..56f3a04 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
@@ -216,10 +216,10 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
     public Result<?> insertNewMajorList() {
         LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
         helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
-        helqw.eq(YxHistoryMajorEnroll::getMajorType,"体育类");
+        helqw.eq(YxHistoryMajorEnroll::getMajorType,"播音与主持类");
         List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
         LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
-        smlqw.eq(YxSchoolMajor::getMajorType,"体育类");
+        smlqw.eq(YxSchoolMajor::getMajorType,"播音与主持类");
         List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
         Map<String ,YxSchoolMajor> map = new HashMap<>();
         String key = "";
@@ -515,6 +515,17 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                     AssertUtils.notNull(major, String.format("行[%s],专业未在系统中找到", index));
                     yxHistoryMajorEnroll.setMajorCode(major.getMajorCode());
 
+                    if(enrollmentCode.length() == 1){
+                        enrollmentCode = "0" + enrollmentCode;
+                    }
+
+                    if(schoolCode.length() == 3){
+                        schoolCode = "0" + schoolCode;
+                    }else if(schoolCode.length() == 2){
+                        schoolCode = "00" + schoolCode;
+                    }else if(schoolCode.length() == 1){
+                        schoolCode = "000" + schoolCode;
+                    }
 
                     if ("提前批".equals(batch)) {
                         batch = "本科提前批";