From 2d022282ab84dff5ecbc1ffb42cd37bd98a80cb0 Mon Sep 17 00:00:00 2001
From: Wzp <18595927131@163.com>
Date: Fri, 27 Jun 2025 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6/api/school/matchSchoolList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/service/impl/MallSchoolServiceImpl.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolServiceImpl.java
index 4e2139e..a4dc2a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallSchoolServiceImpl.java
@@ -1142,6 +1142,16 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
             // List<MallSchoolTag> allTag = mallSchoolTagMapper.selectTagList();
             // 学校录取率计算
             try {
+
+                boolean flag = false;
+
+                if (subjectType.equals("0") && majorScore >= 193 && cultureScore >= 331){
+                    flag = true;
+                }else if (subjectType.equals("1") && majorScore >= 193 && cultureScore >= 328){
+                    flag = true;
+                }
+                boolean finalFlag = flag;
+
                 CountDownLatch countDownLatch = new CountDownLatch(schoolVOS.size());
 
                 for (SchoolVO schoolVO : schoolVOS) {
@@ -1161,7 +1171,7 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
                                     result.put("acceptRate", BigDecimal.ZERO);
                                     result.put("rateType", -2);
                                 }
-                            } else {
+                            } else if (finalFlag){
                                 // 本科
                                 mallSchoolAccept = mallSchoolAcceptMapper.selectMinReferenceBySchoolId(schoolVO.getSchoolId(), batchId, subjectType);
                                 // 计算
@@ -1171,6 +1181,9 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
                                     result.put("acceptRate", "0");
                                     result.put("rateType", -2);
                                 }
+                            }else {
+                                result.put("acceptRate", "0");
+                                result.put("rateType", -2);
                             }
 
 
-- 
2.22.0