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-03-20 16:26:47 +08:00
parent 323f8446c5
commit cd8243e09f
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,7 +246,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
params.setHeadRows(1);
params.setNeedSave(true);
long start = System.currentTimeMillis();
int index = 0;
int index = 3;
try {
//加载省控线
Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.allMaps();
@ -271,6 +271,8 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
Integer enrollNum = null;
Integer admissionNum = null;
String detail = null;
String majorTypeChild = null;
String mainSubjects = null;
YxMajor major = null;
YxHistoryScoreControlLine historyScoreControlLine = null;
YxHistoryMajorEnroll oldYxHistoryMajorEnroll = null;
@ -293,6 +295,8 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
enrollNum = yxHistoryMajorEnroll.getEnrollNum();//招生人数
admissionNum = yxHistoryMajorEnroll.getAdmissionNum();//录取人数
detail = yxHistoryMajorEnroll.getDetail();//备注
majorTypeChild = yxHistoryMajorEnroll.getMajorTypeChild();
mainSubjects = yxHistoryMajorEnroll.getMainSubjects();
AssertUtils.notEmpty(schoolCode, String.format("行[%s],请输入学校代码", index));
AssertUtils.notEmpty(schoolName, String.format("行[%s],请输入学校名称", index));
AssertUtils.notEmpty(batch, String.format("行[%s],请输入批次", index));
@ -319,7 +323,19 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
yxHistoryMajorEnroll.setMajorCode(major.getMajorCode());
//省控线
//文科_本科A段_美术与设计_2023
key = category + "_" + batch + "_" + majorType + "_" + year;
if ("舞蹈类".equals(majorType)) {
AssertUtils.notEmpty(mainSubjects,String.format("行[%s],未识别到舞蹈类型", index));
if (mainSubjects.contains("艺术舞蹈")) {
key = category + "_" + batch + "_" + "艺术舞蹈类" + "_" + year;
}else if (mainSubjects.contains("国际标准")) {
key = category + "_" + batch + "_" + "国际标准舞类" + "_" + year;
}else{
throw new JeecgBootException(String.format("行[%s],未识别到舞蹈类型", index));
}
}else{
key = category + "_" + batch + "_" + majorType + "_" + year;
}
historyScoreControlLine = historyScoreControlLineMap.get(key);
AssertUtils.notNull(historyScoreControlLine, String.format("行[%s],未在系统中找到省控线", index));
culturalScore = historyScoreControlLine.getCulturalScore();
@ -334,7 +350,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
zhuanyeBili = new BigDecimal(operator.split("\\*")[1]);
}
}
if ("文过专排".equals(rulesEnrollProbability)) {
if ("文过专排".equals(rulesEnrollProbability)||"文过专排主科".equals(rulesEnrollProbability)) {
BigDecimal multiply = specialScore.multiply(zhuanyeBili);
yxHistoryMajorEnroll.setControlLine(multiply);
yxHistoryMajorEnroll.setRulesEnrollProbability("文过专排");
@ -359,7 +375,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorName, majorName);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getEnrollmentCode, enrollmentCode);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getSchoolCode,schoolCode);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,batch);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,batch.contains("提前批")?"提前批":batch);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory,category);
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorType, majorType);
oldYxHistoryMajorEnroll = yxHistoryMajorEnrollService.getOne(yxHistoryMajorEnrollLambdaQueryWrapper);
@ -389,7 +405,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
return Result.error("文件导入失败:有重复数据！");
} else {
return Result.error("文件导入失败:" + e.getMessage());
return Result.error("文件导入失败:" + e.getMessage()+",行:"+index);
}
} finally {
try {

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxHistoryMajorEnroll.java
View File

@ -116,8 +116,7 @@ public class YxHistoryMajorEnroll implements Serializable {
/**学费*/
@Excel(name = "学费", width = 15)
@ApiModelProperty(value = "学费")
@TableField(exist = false)
private java.math.BigDecimal tuition;
private String tuition;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")

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

@ -96,7 +96,7 @@ public class YxHistoryScoreControlLineServiceImpl extends ServiceImpl<YxHistoryS
key = record.getCategory() + "_" + record.getBatch() + "_" + record.getProfessionalCategory() + "_" + record.getYear();
maps.put(key,record);
if (record.getBatch().equals("本科A段")) {
key = record.getCategory() + "_提前批_" + record.getProfessionalCategory() + "_" + record.getYear();
key = record.getCategory() + "_本科提前批_" + record.getProfessionalCategory() + "_" + record.getYear();
maps.put(key,record);
}
}