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 14:18:50 +08:00
parent 54e4792ad0
commit f357c3ee84
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
AssertUtils.notEmpty(majorCode, "请输入[专业代码]!"); AssertUtils.notEmpty(majorCode, "请输入[专业代码]!");
AssertUtils.notEmpty(majorName, "请输入[专业名称]!"); AssertUtils.notEmpty(majorName, "请输入[专业名称]!");
AssertUtils.notNull(yxHistoryMajorEnroll.getYear(), "请输入[年份]!"); AssertUtils.notNull(yxHistoryMajorEnroll.getYear(), "请输入[年份]!");
AssertUtils.notTrue(yxHistoryMajorEnrollService.exist(yxHistoryMajorEnroll), String.format("专业-[%s]-已经录入", majorCode)); //AssertUtils.notTrue(yxHistoryMajorEnrollService.exist(yxHistoryMajorEnroll), String.format("专业-[%s]-已经录入", majorCode));
yxHistoryMajorEnrollService.updateById(yxHistoryMajorEnroll); yxHistoryMajorEnrollService.updateById(yxHistoryMajorEnroll);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@ -336,18 +336,21 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
if ("文过专排".equals(rulesEnrollProbability)) { if ("文过专排".equals(rulesEnrollProbability)) {
BigDecimal multiply = specialScore.multiply(zhuanyeBili); BigDecimal multiply = specialScore.multiply(zhuanyeBili);
yxHistoryMajorEnroll.setControlLine(multiply); yxHistoryMajorEnroll.setControlLine(multiply);
yxHistoryMajorEnroll.setRulesEnrollProbability("文过专排");
} else if ("专过文排".equals(rulesEnrollProbability)) { } else if ("专过文排".equals(rulesEnrollProbability)) {
BigDecimal multiply = specialScore.multiply(wenhuaBili); BigDecimal multiply = specialScore.multiply(wenhuaBili);
yxHistoryMajorEnroll.setControlLine(multiply); yxHistoryMajorEnroll.setControlLine(multiply);
yxHistoryMajorEnroll.setRulesEnrollProbability("专过文排");
} else if ("其他计算办法".equals(rulesEnrollProbability)) { } else if ("其他计算办法".equals(rulesEnrollProbability)) {
yxHistoryMajorEnroll.setRulesEnrollProbability("其他计算办法");
} else { } else {
if (wenhuaBili == null || zhuanyeBili == null) { if (wenhuaBili == null || zhuanyeBili == null) {
wenhuaBili = YxConstant.bigDecimal100; wenhuaBili = YxConstant.bigDecimal100;
zhuanyeBili = YxConstant.bigDecimal100; zhuanyeBili = YxConstant.bigDecimal100;
} }
yxHistoryMajorEnroll.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili)))); yxHistoryMajorEnroll.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
} }
yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
//查询库中是否有该条数据 //查询库中是否有该条数据
yxHistoryMajorEnrollLambdaQueryWrapper.clear(); yxHistoryMajorEnrollLambdaQueryWrapper.clear();