From 580dd09462c6e47adfe5c2a25296cf519e93087a Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Thu, 20 Jun 2024 21:41:07 +0800 Subject: [PATCH] =?UTF-8?q?updates=20=E7=BD=91=E9=A1=B5=E7=AB=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E5=B9=B4=E7=BA=BF=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/web/dto/RecommendMajorDTO.java | 3 +++ .../yx/service/impl/YxCalculationMajorServiceImpl.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java index 1b9111f..b3a4bc1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java @@ -157,4 +157,7 @@ public class RecommendMajorDTO implements Serializable { private String privateRulesEnrollProbability; @ApiModelProperty(value = "内部录取方式运算符") private String privateProbabilityOperator; + + @ApiModelProperty(value = "线差") + private BigDecimal scoreLineDifference; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index c1de25f..e46600f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -153,6 +153,8 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl historyScoreControlLineMap = yxHistoryScoreControlLineService.mapsBatchByProfessionalCategoryOfYear(2024, activeCurrentUserScore.getProfessionalCategory(), activeCurrentUserScore.getCognitioPolyclinic()); + //标签类别 if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) { queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(","))); @@ -205,6 +207,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl recommendMajorDTOList = recommendMajorList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize) .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); //组装返回对象