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

updates

This commit is contained in:
zhouwentao 2025-05-08 21:40:44 +08:00
parent 55ec8cd23a
commit 3c243ad5a6
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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