From 970c7c17952ee900ced8858f401ad02c34ce813c Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Fri, 14 Jun 2024 10:23:45 +0800 Subject: [PATCH] updates --- .../modules/yx/service/impl/YxCalculationMajorServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 eba207d..9e2e882 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,7 @@ 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(!r.getMajorType().equals("体育类") && + if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专") && ( !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability()) || (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx()) )