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-06-24 23:03:16 +08:00
parent bf3cbd8fcb
commit 078c376b60
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java
View File

@ -97,7 +97,7 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
}else{ }else{
//redis中没有 //redis中没有
LambdaQueryWrapper<YxHistoryScoreControlLine> queryWrapper=new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxHistoryScoreControlLine> queryWrapper=new LambdaQueryWrapper<>();
queryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory,yxHistoryScoreControlLine.getProfessionalCategory()); queryWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory,yxHistoryScoreControlLine.getProfessionalCategory());
queryWrapper.eq(YxHistoryScoreControlLine::getCategory,yxHistoryScoreControlLine.getCategory()); queryWrapper.eq(YxHistoryScoreControlLine::getCategory,yxHistoryScoreControlLine.getCategory());
queryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')"); queryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')");
List<YxHistoryScoreControlLine> historyScoreControlLineList = yxHistoryScoreControlLineService.list(queryWrapper); List<YxHistoryScoreControlLine> historyScoreControlLineList = yxHistoryScoreControlLineService.list(queryWrapper);
@ -140,12 +140,34 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
} }
} }
if("表演类-戏剧影视表演".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("表演类-戏表");
}else if("表演类-戏剧影视导演".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("表演类-喜导");
}else if("表演类-服装表演".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("表演类-服表");
}else if("音乐类-音乐表演声乐".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("音乐类-音表声乐");
}else if("音乐类-音乐表演器乐".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("音乐类-音表器乐");
}else if("音乐类-音乐教育".equals(historyScoreControlLine.getProfessionalCategory())){
historyScoreControlLine.setProfessionalCategory("音乐类-音教");
}
if ("2024".equals(year)) { if ("2024".equals(year) || "2025".equals(year)) {
if (batch.equals("本科B段")) { if (batch.equals("本科B段")) {
continue; continue;
} }
if(batch.equals("本科A段")){ if(historyScoreControlLine.getProfessionalCategory().contains("表演类") ||
historyScoreControlLine.getProfessionalCategory().contains("音乐类")){
if(batch.equals("本科A段")){
continue;
}
if(!"本科".equals(batch) && ("高职高专".equals(batch) && !historyScoreControlLine.getProfessionalCategory().contains("-"))){
continue;
}
historyScoreControlLine.setBatch(batch + historyScoreControlLine.getProfessionalCategory().replace(professionalCategory,""));
}else if(batch.equals("本科A段")){
historyScoreControlLine.setBatch("本科批"); historyScoreControlLine.setBatch("本科批");
} }
list = dataMaps.getOrDefault(year,new ArrayList<>()); list = dataMaps.getOrDefault(year,new ArrayList<>());
@ -162,8 +184,6 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
list.add(historyScoreControlLine); list.add(historyScoreControlLine);
dataMaps.put(year,list); dataMaps.put(year,list);
} }
} }
json = JSONObject.toJSONString(dataMaps); json = JSONObject.toJSONString(dataMaps);
redisUtil.set(key,json,3600); redisUtil.set(key,json,3600);

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

@ -566,6 +566,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
continue; continue;
} }
if("8691".equals(recommendMajorDTO.getSchoolCode())){
System.out.println("qvq");
}
// 体育类不判断分数过线 // 体育类不判断分数过线
if (!professionalCategory.equals("体育类")) { if (!professionalCategory.equals("体育类")) {