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 4e2139e8bc11764802fb61540070830d52170646..a4dc2a5d4a43ed6e75a94880169735c28c8760c9 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 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); }