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-15 16:01:13 +08:00
parent b85de4540d
commit b6a490e076
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,16 +261,18 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
* @param recommendMajorList
*/
private static void convertRecommendMajorListToNull(List<RecommendMajorDTO> recommendMajorList) {
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> rulesEnrollProbabilityList = Arrays.asList("文*0.8+文*0.5", "文*0.7+文*0.75","文*0.6+专*1","文*0.5+专*1.25");
List<String> rulesEnrollProbabilitySxList = Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
recommendMajorList.forEach(r->{
r.setPlanNum(null);
if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专") &&
( !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability()) ||
(StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())
)
)){
r.setRulesEnrollProbability(null);
//非体育，非专科
if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专")){
if (rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) {
}else if(!rulesEnrollProbabilityList.contains(r.getRulesEnrollProbability())){
r.setRulesEnrollProbability(null);
}
}
});
}