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-10 18:09:56 +08:00
parent 4c2f023aca
commit cf9ca0f265
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java
View File

@ -168,30 +168,28 @@ public class MiniTestCulturalService {
}else if(YxConstant.betaMajorTypeList.contains(professionalCategory)){
for (ArtTestCulturalDTO artTestCulturalDTO : artTestCulturalDtoList) {
probabilityOperator = artTestCulturalDTO.getProbabilityOperator();
if (YxConstant.betaMajorTypeList.contains(professionalCategory) && StringUtils.isNotBlank(artTestCulturalDto.getRulesEnrollProbability())) {
String[] split = probabilityOperator.split("\\+");
BigDecimal culturalProbabilityOperator = null;
BigDecimal professionalProbabilityOperator = null;
//先取出文化分和专业分的计算方式
for (String s : split) {
if (s.contains("专")) {
professionalProbabilityOperator = new BigDecimal( s.split("\\*")[1]);
}else{
culturalProbabilityOperator = new BigDecimal(s.split("\\*")[1]);
}
}
//如果计算方式为空就不算了
if (culturalProbabilityOperator!=null && professionalProbabilityOperator !=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0 && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) {
//当前输入分数乘以专业折合分
BigDecimal professionalConverted = professionalScore.multiply(professionalProbabilityOperator);
//余数，院校分数-专业折合分
BigDecimal remainder = artTestCulturalDto.getScore().subtract(professionalConverted);
//余数/文化课计算方式
BigDecimal divide = remainder.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP);
//需要超越多少分
artTestCulturalDto.setNeedScore(divide);
String[] split = probabilityOperator.split("\\+");
BigDecimal culturalProbabilityOperator = null;
BigDecimal professionalProbabilityOperator = null;
//先取出文化分和专业分的计算方式
for (String s : split) {
if (s.contains("专")) {
professionalProbabilityOperator = new BigDecimal( s.split("\\*")[1]);
}else{
culturalProbabilityOperator = new BigDecimal(s.split("\\*")[1]);
}
}
//如果计算方式为空就不算了
if (culturalProbabilityOperator!=null && professionalProbabilityOperator !=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0 && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) {
//当前输入分数乘以专业折合分
BigDecimal professionalConverted = professionalScore.multiply(professionalProbabilityOperator);
//余数，院校分数-专业折合分
BigDecimal remainder = artTestCulturalDto.getScore().subtract(professionalConverted);
//余数/文化课计算方式
BigDecimal divide = remainder.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP);
//需要超越多少分
artTestCulturalDTO.setNeedScore(divide);
}
}
}
}