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-06-20 21:41:07 +08:00
parent 06225b5672
commit 580dd09462
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java
View File

@ -157,4 +157,7 @@ public class RecommendMajorDTO implements Serializable {
private String privateRulesEnrollProbability; private String privateRulesEnrollProbability;
@ApiModelProperty(value = "内部录取方式运算符") @ApiModelProperty(value = "内部录取方式运算符")
private String privateProbabilityOperator; private String privateProbabilityOperator;
@ApiModelProperty(value = "线差")
private BigDecimal scoreLineDifference;
} }

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

@ -153,6 +153,8 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
queryRecommendMajorVO.getPCategoryChildrenList().add("兼报"); queryRecommendMajorVO.getPCategoryChildrenList().add("兼报");
} }
} }
Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(2024, activeCurrentUserScore.getProfessionalCategory(), activeCurrentUserScore.getCognitioPolyclinic());
//标签类别 //标签类别
if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) { if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {
queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(","))); queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(",")));
@ -205,6 +207,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
this.setSchoolTagsList(recommendMajorList); this.setSchoolTagsList(recommendMajorList);
List<RecommendMajorDTO> recommendMajorDTOList = recommendMajorList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize) List<RecommendMajorDTO> recommendMajorDTOList = recommendMajorList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize)
.collect(Collectors.toList()); .collect(Collectors.toList());
YxHistoryScoreControlLine yxHistoryScoreControlLine = null;
for (RecommendMajorDTO recommendMajorDTO : recommendMajorDTOList) {
yxHistoryScoreControlLine = historyScoreControlLineMap.get(recommendMajorDTO.getBatch());
if (yxHistoryScoreControlLine!=null) {
recommendMajorDTO.setScoreLineDifference(recommendMajorDTO.getStudentScore().subtract(ScoreUtil.covertIntoControlLine(recommendMajorDTO.getRulesEnrollProbability(), yxHistoryScoreControlLine.getCulturalScore(), yxHistoryScoreControlLine.getSpecialScore(), recommendMajorDTO.getFirstLevelDiscipline(), recommendMajorDTO.getProbabilityOperator())));
}
}
//包装历年信息 //包装历年信息
yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList); yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList);
//组装返回对象 //组装返回对象