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-05-15 21:41:25 +08:00
parent 4ef7a221d1
commit 4d0e381880
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,6 +332,14 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
major = majorMap.get(mn);
AssertUtils.notNull(major, String.format("行[%s],专业未在系统中找到", index));
yxHistoryMajorEnroll.setMajorCode(major.getMajorCode());
if (index==11) {
System.out.println("1");
}
if ("提前批".equals(batch)) {
batch = "本科提前批";
}
//省控线
//文科_本科A段_美术与设计_2023
if ("舞蹈类".equals(majorType)) {
@ -343,6 +351,13 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
} else {
throw new JeecgBootException(String.format("行[%s],未识别到舞蹈类型", index));
}
} else if(majorType.contains("体育")){
if (batch.contains("专科") || batch.contains("高职高专")) {
batch = "高职高专";
}else{
batch = "本科";
}
key = category + "_" + batch + "_" + majorType + "_" + year;
} else {
key = category + "_" + batch + "_" + majorType + "_" + year;
}
@ -380,6 +395,18 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
}
if("体育".contains(yxHistoryMajorEnroll.getMajorType())){
if(batch.contains("专科") || batch.contains("高职高专")){
yxHistoryMajorEnroll.setBatch("高职高专");
}else {
yxHistoryMajorEnroll.setBatch("本科");
}
}else if (batch.contains("提前")) {
yxHistoryMajorEnroll.setBatch("提前批");
}
//查询库中是否有该条数据
yxHistoryMajorEnrollLambdaQueryWrapper.clear();
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getYear, year);
@ -390,6 +417,8 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory, category);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorType, majorType);
oldYxHistoryMajorEnroll = yxHistoryMajorEnrollService.getOne(yxHistoryMajorEnrollLambdaQueryWrapper);
if (oldYxHistoryMajorEnroll == null) {
updateList.add(yxHistoryMajorEnroll);
} else {