From 1ac8383a9e94f744e7107b58e2e35ba302a98790 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Fri, 14 Jun 2024 09:48:34 +0800 Subject: [PATCH] updates --- .../yx/service/impl/YxCalculationMajorServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index 4906c5b..eebaaeb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -264,7 +264,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl rulesEnrollProbabilitySxList = Arrays.asList("专过文排", "文8专2", "文*0.8+文*0.5", "文7专3", "文*0.7+文*0.75", "文6专4", "文*0.6+专*1", "文5专5", "文*0.5+专*1.25"); recommendMajorList.forEach(r->{ r.setPlanNum(null); - if (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) { + if (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && + !r.getMajorType().equals("体育类") && + !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) { r.setRulesEnrollProbability(null); } });