yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-06-14 09:54:35 +08:00
parent 1ac8383a9e
commit baf32ff217
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
View File

@ -264,9 +264,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
List<String> 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"); List<String> 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->{ recommendMajorList.forEach(r->{
r.setPlanNum(null); r.setPlanNum(null);
if (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && if(StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) &&
!r.getMajorType().equals("体育类") && !r.getMajorType().equals("体育类") &&
!rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) { !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability())||!rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())){
r.setRulesEnrollProbability(null); r.setRulesEnrollProbability(null);
} }
}); });