From 06225b5672344b98d7c72a60ced4a107fbd4a809 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 20 Jun 2024 12:01:15 +0800
Subject: [PATCH] updates

---
 .../YxHistoryMajorEnrollController.java           | 15 +++++----------
 .../impl/YxVolunteerRecordServiceImpl.java        |  8 ++------
 2 files changed, 7 insertions(+), 16 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 47bcbd0..86aed1e 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
@@ -248,22 +248,17 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
         queryWrapper.apply("control_line > admission_line")
                 .gt(YxHistoryMajorEnroll::getAdmissionLine, 1);
         List<YxHistoryMajorEnroll> historyMajorEnrollList = yxHistoryMajorEnrollService.list(queryWrapper);
-        dataList = historyMajorEnrollList;
         List<YxSchoolMajor> schoolMajorList1 = yxSchoolMajorService.list(new LambdaQueryWrapper<YxSchoolMajor>());
         Map<String,YxSchoolMajor> map1 =new LinkedHashMap<>();
         for (YxSchoolMajor y : schoolMajorList1) {
-            map1.put(y.getSchoolCode()+"_"+y.getEnrollmentCode()+"_"+y.getMajorType()+"_"+y.getCategory(),y);
+            map1.put(y.getSchoolCode()+"_"+y.getMajorType()+"_"+y.getCategory(),y);
         }
-        for (YxHistoryMajorEnroll y : dataList) {
-            YxSchoolMajor yxSchoolMajor = map1.get(y.getSchoolCode() + "_" + y.getEnrollmentCode() + "_" + y.getMajorType() + "_" + y.getCategory());
+        for (YxHistoryMajorEnroll y : historyMajorEnrollList) {
+            YxSchoolMajor yxSchoolMajor = map1.get(y.getSchoolCode() + "_" + y.getMajorType() + "_" + y.getCategory());
             if (yxSchoolMajor!=null) {
-                if(yxSchoolMajor.getTuition()!=null){
-                    y.setTuition(yxSchoolMajor.getTuition().toString());
-                }
-                if(StringUtils.isNotBlank(yxSchoolMajor.getDetail())){
-                    y.setDetail(yxSchoolMajor.getDetail());
-                }
+                continue;
             }
+            dataList.add(y);
         }
 
         if(false){
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java
index a691b93..5970f9c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java
@@ -84,11 +84,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
             String key = majorCode+schoolCode+enrollmentCode+category;
             //判断这个批次段的是否已填满
             long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
-//            if ("体育类".equals(majorType)) {
-//                AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿");
-//            }else{
-            //            }
-            AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿");
+            AssertUtils.notTrue(count>=35,"高职高专仅可以填报三十五个志愿");
         }else if(YxConstant.batchList1.contains(batch)){
             //本科批
             yxVolunteerRecordLambdaQueryWrapper.in(YxVolunteerRecord::getBatch,YxConstant.batchList1);
@@ -97,7 +93,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
             String key = majorCode+schoolCode+enrollmentCode+category;
             //判断这个批次段的是否已填满
             long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
-            AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿");
+            AssertUtils.notTrue(count>=35,"本科批仅可以填报三十五个志愿");
         }
 
         //循环已填报专业，与当前专业对比是否一致