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-05-10 21:09:01 +08:00
parent 9eee904a93
commit 02a1116af9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java
View File

@ -70,6 +70,8 @@ public class YxConstant {
public static BigDecimal bigDecimal1 = new BigDecimal("1");
public static BigDecimal bigDecimal175 = new BigDecimal("175");
public static BigDecimal bigDecimal75 = new BigDecimal("75");
public static BigDecimal bigDecimal7p5 = new BigDecimal("7.5");
public static BigDecimal bigDecimal50 = new BigDecimal("50");
public static String oldCalculationMajorName = "yx_calculation_major";
public static String newCalculationMajorName = "yx_calculation_major";

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

@ -559,6 +559,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
//算分用
// 当前学生的分数折合
studentScore = ScoreUtil.convertIntoScore(rulesEnrollProbability, activeCurrentUserScore.getCulturalScore(), activeCurrentUserScore.getProfessionalScore(), recommendMajorDTO.getFirstLevelDiscipline(), probabilityOperator);
if (professionalCategory.equals("体育类") && "专过文排".equals(rulesEnrollProbability)) {
studentScore = studentScore.divide(YxConstant.bigDecimal7p5);
}
recommendMajorDTO.setPrivateStudentScore(studentScore);
if (StringUtils.isNotBlank(recommendMajorDTO.getRulesEnrollProbability())) {
//recommendMajorDTO.setStudentConvertedScore(studentScore);